feature-cfm31 post rebase fixes #1 (#262)

* Fix Copy value button label post-rebase (CFM-31) * Fix email address top-link post-rebase (CFM-31)
COmanage · Dec 17, 2024 · d282d67 · d282d67
1 parent cdf0409
commit d282d67
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/app/templates/EmailAddresses/fields-nav.inc b/app/templates/EmailAddresses/fields-nav.inc
@@ -26,15 +26,18 @@
  */
 
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [
-  [
-    'icon' => 'verified_user',
-    'order' => 'Default',
-    'label' => __d('operation', 'EmailAddresses.verify.force'),
-    'if' => 'notVerified',
-    'link' => [
-      'action' => 'forceVerify',
-      $vv_obj->id
-    ],
-  ];
-];
+  if($vv_action != 'add') {
+    $topLinks = [
+      [
+        'icon' => 'verified_user',
+        'order' => 'Default',
+        'label' => __d('operation', 'EmailAddresses.verify.force'),
+        'if' => 'notVerified',
+        'link' => [
+          'action' => 'forceVerify',
+          $vv_obj->id
+        ],
+        'class' => ''
+      ],
+    ];
+  }
diff --git a/app/webroot/js/comanage/components/common/copy-value-button.js b/app/webroot/js/comanage/components/common/copy-value-button.js
@@ -69,7 +69,7 @@ export default {
       :aria-label="this.ariaLabel" 
       @click.stop.prevent="copyValue(this.valueToCopy)">
       <span class="material-symbols-outlined">{{ this.copyIcon }}</span>
-      <span class="cm-copy-value-text">{{ this.txt.copy }}</span>
+      <span class="cm-copy-value-text">{{ this.txt['operation.copy'] }}</span>
     </button>
   `
 }