Subnavigation fixes (COmanage#230)

arlen · Dec 19, 2024 · dc8285c · dc8285c
1 parent 89f15c0
commit dc8285c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
@@ -40,7 +40,6 @@
 class AttributeCollectorsTable extends Table {
   use \App\Lib\Traits\AutoViewVarsTrait;
   use \App\Lib\Traits\CoLinkTrait;
-  use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TabTrait;

diff --git a/app/src/Model/Table/EnrollmentFlowStepsTable.php b/app/src/Model/Table/EnrollmentFlowStepsTable.php
@@ -41,7 +41,6 @@ class EnrollmentFlowStepsTable extends Table {
   use \App\Lib\Traits\AutoViewVarsTrait;
   use \App\Lib\Traits\ChangelogBehaviorTrait;
   use \App\Lib\Traits\CoLinkTrait;
-  use \App\Lib\Traits\LayoutTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PluggableModelTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;

diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php
@@ -175,7 +175,7 @@ public function initialize(array $config): void {
           // render in index mode for the same use case/context
           // XXX edit should go first.
           'People' => ['edit', 'view'],
-          'PersonRoles' => ['edit','view','index'],
+          'PersonRoles' => ['edit', 'view', 'index'],
           'ExternalIdentities' => ['index'],
         ],
         // What model will have a counter-badge after the tab title

diff --git a/app/templates/element/subnavigation/inlineList.php b/app/templates/element/subnavigation/inlineList.php
@@ -51,6 +51,7 @@
   ?>
   <li class="list-inline-item">
     <?php
+    $curId = $this->Tab->getCurrentId($tab, $isNested);
     // Construct Element Title
     $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested'));
     // Construct Target URL