Subnavigation fixes

app/availableplugins/FileConnector/src/Controller/FileSourcesController.php

@@ -30,11 +30,34 @@
 namespace FileConnector\Controller;
 
 use App\Controller\StandardPluginController;
+use Cake\Event\EventInterface;
+use Cake\Http\Response;
 
 class FileSourcesController extends StandardPluginController {
   public $paginate = [
     'order' => [
       'FileSources.id' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->FileSources->ExternalIdentitySources->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->FileSources->ExternalIdentitySources->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->FileSources->ExternalIdentitySources->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }

app/plugins/CoreEnroller/src/Controller/AttributeCollectorsController.php

@@ -31,6 +31,8 @@
 
 use App\Controller\StandardEnrollerController;
 use App\Lib\Enum\PetitionStatusEnum;
+use Cake\Event\EventInterface;
+use Cake\Http\Response;
 
 class AttributeCollectorsController extends StandardEnrollerController {
   public $paginate = [
@@ -39,6 +41,27 @@ class AttributeCollectorsController extends StandardEnrollerController {
     ]
   ];
 
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->AttributeCollectors->EnrollmentFlowSteps->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->AttributeCollectors->EnrollmentFlowSteps->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->AttributeCollectors->EnrollmentFlowSteps->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
+
   /**
    * Dispatch an Enrollment Flow Step.
    * 

app/plugins/CoreEnroller/src/Controller/EnrollmentAttributesController.php

@@ -51,6 +51,14 @@ class EnrollmentAttributesController extends StandardEnrollerController {
   public function beforeRender(\Cake\Event\EventInterface $event) {
     $this->set('vv_supported_attributes', $this->EnrollmentAttributes->supportedAttributes());
 
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->EnrollmentAttributes->AttributeCollectors->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->EnrollmentAttributes->AttributeCollectors->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->EnrollmentAttributes->AttributeCollectors->getPrimaryKey());
+    }
+
     $ret = parent::beforeRender($event);
 
     // Override the auto-generated title

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;

app/plugins/CoreEnroller/src/Model/Table/EnrollmentAttributesTable.php

@@ -41,13 +41,13 @@
 class EnrollmentAttributesTable 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\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\TabTrait;
-
+  use \App\Lib\Traits\LayoutTrait;
+
   /**
    * Perform Cake Model initialization.
    *

app/plugins/CoreEnroller/templates/EnrollmentAttributes/columns.inc

@@ -33,6 +33,7 @@ $indexColumns = [
   'label' => [
     'type' => 'link',
     'sortable' => true,
+    'class' => 'cm-modal-link nospin', // launch this in a modal
     'dataAttrs' => [
       ['data-cm-modal-title', __d('operation', 'EnrollmentAttributes', 1)]
     ]

app/resources/locales/en_US/operation.po

@@ -135,6 +135,12 @@ msgstr "Edit"
 msgid "edit.a"
 msgstr "Edit {0}"
 
+msgid "edit.PersonRoles.a"
+msgstr "Edit Role {0}"
+
+msgid "edit.ExternalIdentityRoles.a"
+msgstr "Edit Role {0}"
+
 msgid "EmailAddresses.verify.force"
 msgstr "Force Verify"
 
@@ -267,3 +273,9 @@ msgstr "View"
 msgid "view.a"
 msgstr "View {0}"
 
+msgid "view.PersonRoles.a"
+msgstr "View Role {0}"
+
+msgid "view.ExternalIdentityRoles.a"
+msgstr "View Role {0}"
+

app/src/Controller/EnrollmentFlowStepsController.php

@@ -30,6 +30,8 @@
 namespace App\Controller;
 
 // XXX not doing anything with Log yet
+use Cake\Event\EventInterface;
+use Cake\Http\Response;
 use Cake\Log\Log;
 
 class EnrollmentFlowStepsController extends StandardPluggableController {
@@ -38,4 +40,27 @@ class EnrollmentFlowStepsController extends StandardPluggableController {
       'EnrollmentFlowSteps.ordr' => 'asc'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    // Pull the Person name for breadcrumb rendering
+
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->EnrollmentFlowSteps->EnrollmentFlows->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->EnrollmentFlowSteps->EnrollmentFlows->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->EnrollmentFlowSteps->EnrollmentFlows->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }

app/src/Controller/ExternalIdentitiesController.php

@@ -29,9 +29,8 @@
 
 namespace App\Controller;
 
-// XXX not doing anything with Log yet
-use Cake\Log\Log;
-use Cake\ORM\TableRegistry;
+use Cake\Event\EventInterface;
+use Cake\Http\Response;
 
 // Use extend MVEAController for breadcrumb rendering. ExternalIdentities is
 // sort of an MVEA, so maybe it makes sense to treat it as such.
@@ -45,4 +44,27 @@ class ExternalIdentitiesController extends MVEAController {
       'Names.family'
     ]
   ];
+
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    // Pull the Person name for breadcrumb rendering
+
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->ExternalIdentities->People->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->ExternalIdentities->People->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->ExternalIdentities->People->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
 }

app/src/Controller/GroupMembersController.php

@@ -58,6 +58,7 @@ public function beforeRender(EventInterface $event) {
     if(!empty($link->value)) {
       $this->set('vv_bc_parent_obj', $this->GroupMembers->Groups->get($link->value));
       $this->set('vv_bc_parent_displayfield', $this->GroupMembers->Groups->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->GroupMembers->Groups->getPrimaryKey());
     }
 
     return parent::beforeRender($event);

app/src/Controller/GroupNestingsController.php

@@ -54,6 +54,7 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
     if(!empty($link->value)) {
       $this->set('vv_bc_parent_obj', $this->GroupNestings->Groups->get($link->value));
       $this->set('vv_bc_parent_displayfield', $this->GroupNestings->Groups->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->GroupNestings->Groups->getPrimaryKey());
     }
 
     // We need to calculate the available set of groups for nesting. We do this

app/src/Controller/JobHistoryRecordsController.php

@@ -55,6 +55,7 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
     if(!empty($link->value)) {
       $this->set('vv_bc_parent_obj', $this->JobHistoryRecords->Jobs->get($link->value));
       $this->set('vv_bc_parent_displayfield', $this->JobHistoryRecords->Jobs->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->JobHistoryRecords->Jobs->getPrimaryKey());
     }
 
     return parent::beforeRender($event);

app/src/Controller/PetitionsController.php

@@ -30,12 +30,14 @@
 namespace App\Controller;
 
 // XXX not doing anything with Log yet
+use Cake\Event\EventInterface;
+use Cake\Http\Response;
 use Cake\Log\Log;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
-use \App\Lib\Util\StringUtilities;
 use \App\Lib\Enum\EnrollmentActorEnum;
 use \App\Lib\Enum\SuspendableStatusEnum;
+use \App\Lib\Util\StringUtilities;
 
 class PetitionsController extends StandardController {
   use \App\Lib\Traits\EnrollmentControllerTrait;
@@ -49,6 +51,27 @@ class PetitionsController extends StandardController {
   // Cached copy of the next step information
   private $nextStep = null;
 
+  /**
+   * Callback run prior to the request render.
+   *
+   * @param   EventInterface  $event  Cake Event
+   *
+   * @return Response|void
+   * @since  COmanage Registry v5.0.0
+   */
+
+  public function beforeRender(EventInterface $event) {
+    $link = $this->getPrimaryLink(true);
+
+    if(!empty($link->value)) {
+      $this->set('vv_bc_parent_obj', $this->Petitions->EnrollmentFlows->get($link->value));
+      $this->set('vv_bc_parent_displayfield', $this->Petitions->EnrollmentFlows->getDisplayField());
+      $this->set('vv_bc_parent_primarykey', $this->Petitions->EnrollmentFlows->getPrimaryKey());
+    }
+
+    return parent::beforeRender($event);
+  }
+
   /**
    * Calculate authorization for the current request.
    * 

app/src/Controller/StandardPluginController.php

@@ -96,6 +96,7 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
 
       $this->set('vv_bc_parent_obj', $parentObj);
       $this->set('vv_bc_parent_displayfield', $parentDisplayField);
+      $this->set('vv_bc_parent_primarykey', $parentTable->getPrimaryKey());
 
       // Override the title set in StandardController. Since that was set in edit()
       // which is called before the rendering hooks, this title will take precedence.

app/src/Lib/Util/StringUtilities.php

@@ -162,6 +162,7 @@ public static function entityAndActionToTitle($entity,
 
     $linkTable  = TableRegistry::getTableLocator()->get($modelPath);
     $msgId = "{$action}.a";
+    $msgIdOverride = "{$action}.{$modelsName}.a";
 
     if(Inflector::singularize(self::entityToClassName($entity)) !== Inflector::singularize($modelsName)) {
       $linkTable  = TableRegistry::getTableLocator()->get(self::entityToClassName($entity));
@@ -188,7 +189,10 @@ public static function entityAndActionToTitle($entity,
        && method_exists($linkTable, 'generateDisplayField')) {
       // We don't use a trait for this since each table will implement different logic
 
-      $title = __d($domain, $msgId, $linkTable->generateDisplayField($entity));
+      $title = __d($domain, $msgIdOverride, $linkTable->generateDisplayField($entity));
+      if ($msgIdOverride === $title) {
+        $title = __d($domain, $msgId, $linkTable->generateDisplayField($entity));
+      }
       $supertitle = $linkTable->generateDisplayField($entity);
       // Pass the display field also into subtitle for dealing with External IDs
       $subtitle = $linkTable->generateDisplayField($entity);

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;

app/src/Model/Table/ExternalIdentityRolesTable.php

@@ -46,10 +46,10 @@ class ExternalIdentityRolesTable extends Table {
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\QueryModificationTrait;
-  use \App\Lib\Traits\TableMetaTrait;
-  use \App\Lib\Traits\ValidationTrait;
   use \App\Lib\Traits\SearchFilterTrait;
   use \App\Lib\Traits\TabTrait;
+  use \App\Lib\Traits\TableMetaTrait;
+  use \App\Lib\Traits\ValidationTrait;
 
   /**
    * Perform Cake Model initialization.
@@ -91,7 +91,7 @@ public function initialize(array $config): void {
          ->setDependent(true)
          ->setCascadeCallbacks(true);
 
-    $this->setDisplayField('id');
+    $this->setDisplayField('title');
 
     $this->setPrimaryLink('external_identity_id');
     $this->setRequiresCO(true);

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