diff --git a/app/src/Lib/Traits/LayoutTrait.php b/app/src/Lib/Traits/LayoutTrait.php index b178b507..1294d2b1 100644 --- a/app/src/Lib/Traits/LayoutTrait.php +++ b/app/src/Lib/Traits/LayoutTrait.php @@ -55,6 +55,7 @@ public function getLayout(string $action = ''): string 'add', 'view', 'edit' => 'iframe', + 'deleted' => 'iframe', default => 'default' }; } diff --git a/app/src/View/Helper/VueHelper.php b/app/src/View/Helper/VueHelper.php index 74c55a22..dde16546 100644 --- a/app/src/View/Helper/VueHelper.php +++ b/app/src/View/Helper/VueHelper.php @@ -63,6 +63,7 @@ class VueHelper extends Helper { 'information' => [ 'global.attributes.none', 'global.value.none', + 'global.visit.link', 'record', 'report.for', 'value.copied' diff --git a/app/templates/Petitions/resume.php b/app/templates/Petitions/resume.php index a3cb65ef..65e0b09b 100644 --- a/app/templates/Petitions/resume.php +++ b/app/templates/Petitions/resume.php @@ -32,6 +32,7 @@ $action_args = []; if(!empty($vv_cur_co) && $vv_user_roles['authuser']) { + $action_args['vv_attr_id'] = $vv_primary_link_obj->name; if($vv_user_roles['co'] || $vv_user_roles['platform']) { $action_args['vv_actions'][] = [ 'order' => $this->Menu->getMenuOrder('Default'), diff --git a/app/templates/Standard/deleted.php b/app/templates/Standard/deleted.php index d8cf635b..1642d95c 100644 --- a/app/templates/Standard/deleted.php +++ b/app/templates/Standard/deleted.php @@ -73,7 +73,7 @@ diff --git a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js index e1a2272a..c52fcb50 100644 --- a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js +++ b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js @@ -269,7 +269,7 @@ export default { return this.options.label; } // Otherwise return the default - return this.txt['autocomplete.people.label']; + return this.txt['operation.autocomplete.people.label']; }, hasAutoCompleteLabel: function() { // Check to see if a label has been passed in @@ -312,7 +312,7 @@ export default { - {{ this.txt['GroupMembers'] }} + {{ this.txt['controller.GroupMembers'] }}