diff --git a/app/src/Controller/Component/AuthorizationComponent.php b/app/src/Controller/Component/AuthorizationComponent.php index 92bc9489..59852cc6 100644 --- a/app/src/Controller/Component/AuthorizationComponent.php +++ b/app/src/Controller/Component/AuthorizationComponent.php @@ -191,6 +191,7 @@ public function menuPermissions($username, $matchgridId=null) { 'matchgrid_settings' => $platformAdmin || $mgAdmin, 'rules' => $platformAdmin || $mgAdmin, 'systems_of_record' => $platformAdmin || $mgAdmin, + 'reconcile' => $platformAdmin || $mgAdmin || $recMgr, // Permissions specific to a matchgrid 'gridroles' => $perms['matchgrids'], // Overall permission to manage the matchgrids diff --git a/app/src/Locale/en_US/default.po b/app/src/Locale/en_US/default.po index 01a82722..e379014d 100644 --- a/app/src/Locale/en_US/default.po +++ b/app/src/Locale/en_US/default.po @@ -478,16 +478,21 @@ msgid "match.home.welcome" msgstr "Welcome to {0}." ### Informational Messages +msgid "match.in.matchgrid.display" +msgstr "Display all records associated with this Matchgrid." + +msgid "match.in.matchgrid.reconcile" +msgstr "Resolve matching records when COmanage determines the same person may be coming from multiple systems of record." + +msgid "match.in.matchgrid.select" +msgstr "Select the Matchgrid you'd like to manage. A Matchgrid is used to match identity records across multiple authoritative systems of record." + msgid "match.in.matchgrids.none" msgstr "There are no matchgrids currently defined." msgid "match.in.pagination.format" msgstr "Page {{page}} of {{pages}}, Viewing {{start}}-{{end}} of {{count}}" -### Menu Items -msgid "match.me.platform" -msgstr "Platform" - ### Operations (Commands) msgid "match.op.add.a" msgstr "Add New {0}" @@ -504,6 +509,9 @@ msgstr "Build" msgid "match.op.build.confirm" msgstr "Are you sure you wish to (re)build this matchgrid?" +msgid "match.op.configure.a" +msgstr "Configure {0}" + msgid "match.op.delete" msgstr "Delete" @@ -513,6 +521,9 @@ msgstr "Are you sure you wish to delete this record ({0})?" msgid "match.op.display" msgstr "Display" +msgid "match.op.display.records" +msgstr "Display Records" + msgid "match.op.duplicate" msgstr "Duplicate" @@ -555,11 +566,17 @@ msgstr "Display" msgid "match.op.page.goto" msgstr "Go To Page" +msgid "match.op.platform" +msgstr "Platform" + msgid "match.op.previous" msgstr "Previous" msgid "match.op.reconcile" -msgstr "Reconcile Unresolved Requests" +msgstr "Reconcile" + +msgid "match.op.reconcile.requests" +msgstr "Reconcile Requests" msgid "match.op.reconcile.a" msgstr "Reconcile Unresolved Requests ({0})" @@ -615,3 +632,10 @@ msgstr "Request could not be canonically resolved, pending record {0} created" msgid "match.rs.saved" msgstr "Saved" + +### Titles +msgid "match.ti.matchgrid.config" +msgstr "Matchgrid Configuration" + +msgid "match.ti.matchgrid" +msgstr "Matchgrid: {0}" \ No newline at end of file diff --git a/app/src/Template/Element/breadcrumbs.ctp b/app/src/Template/Element/breadcrumbs.ctp index e7f33be0..a3aa9270 100644 --- a/app/src/Template/Element/breadcrumbs.ctp +++ b/app/src/Template/Element/breadcrumbs.ctp @@ -47,16 +47,6 @@ if($this->request->getRequestTarget(false) != '/') { 'action' => 'select'] ); - if($modelsName != 'Matchgrids' && $modelsName != 'Permissions' && $modelsName != 'ApiUsers' - || ($modelsName == 'Matchgrids' && ($action == 'reconcile' || $action == 'pending'))) { - // Link to matchgrids listing where appropriate - $this->Breadcrumbs->add( - __('match.ct.Matchgrids', [99]), - ['controller' => 'matchgrids', - 'action' => 'index' ] - ); - } - if(!empty($vv_cur_mg) && ($modelsName != 'Matchgrids' || $action != 'manage')) { // Link to matchgrid if set @@ -93,7 +83,7 @@ if($this->request->getRequestTarget(false) != '/') { ); } - if($action != 'index' + if($action != 'index' && $action != 'manage' && !($modelsName == 'Matchgrids' && $action == 'pending')) { // Default parent is index, to which we might need to append the Primary Link ID diff --git a/app/src/Template/Element/javascript.ctp b/app/src/Template/Element/javascript.ctp index 94e64e9e..ab33a6fb 100644 --- a/app/src/Template/Element/javascript.ctp +++ b/app/src/Template/Element/javascript.ctp @@ -29,9 +29,6 @@