feature-cfm31 post rebase fixes2 (#264)

* Fix resume page top menu unique id (CFM-31) * Fix javascript i18n text references in people picker post rebase (CFM-31) * Fix JavaScript "Global visit link" text reference in URL MVEA post rebase (CFM-31) * Update "deleted" action post-rebase (CFM-31)
COmanage · Dec 19, 2024 · 5436748 · 5436748
1 parent d282d67
commit 5436748
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -73,7 +73,7 @@
   <button 
     class="btn btn-primary cm-deleted-close-button" 
     onclick="window.parent.hideCmModal()">
-    <em class="material-icons" aria-hidden="true">cancel</em>
+    <em class="material-symbols-outlined" aria-hidden="true">cancel</em>
     <?= __d('operation','close') ?>
   </button>
 

diff --git 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 {
               <!-- XXX The input field will be updated with the option.label value. Here we only need the full name -->
               <span class="cm-ac-name-value" v-if="slotProps.option.isMember" v-html="slotProps.option.fullName"></span>
               <span class="cm-ac-name-value" v-else v-html="this.highlightedquery(slotProps.option.fullName, query)"></span>
-              <span class="mr-1 badge bg-success" v-if="slotProps.option.isMember">{{ this.txt['GroupMembers'] }}</span>
+              <span class="mr-1 badge bg-success" v-if="slotProps.option.isMember">{{ this.txt['controller.GroupMembers'] }}</span>
             </div>
             <div class="cm-ac-item-id">
               ID: {{ slotProps.option.itemId }}

diff --git a/app/webroot/js/comanage/components/mvea/mvea-item.js b/app/webroot/js/comanage/components/mvea/mvea-item.js
@@ -202,7 +202,7 @@ export default {
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'urls'" @click="followRowLink">
       <div class="field-data force-wrap with-hover-button">
         <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.description != '' && this.mvea.description != null ? this.mvea.description : this.mvea.url }}</a>   
-        <a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['global.visit.link']"><span class="material-symbols">north_east</span></a>
+        <a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['information.global.visit.link']"><span class="material-symbols">north_east</span></a>
         <copy-value-button 
           :txt="this.txt" 
           :valueToCopy="this.mvea.url">