Remove deprecated subnavigation config (CFM-31) (#220)

COmanage · Dec 15, 2024 · 2c9d08a · 2c9d08a
1 parent d4b6e43
commit 2c9d08a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 271 deletions.
diff --git a/app/templates/AdHocAttributes/fields-nav.inc b/app/templates/AdHocAttributes/fields-nav.inc
diff --git a/app/templates/Addresses/fields-nav.inc b/app/templates/Addresses/fields-nav.inc
diff --git a/app/templates/EmailAddresses/fields-nav.inc b/app/templates/EmailAddresses/fields-nav.inc
@@ -26,26 +26,15 @@
  */
 
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person', // default for person. 'external identities' are special cased
-  'subActive' => 'email_addresses'
-];
-
-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' => ''
+$topLinks = [
+  [
+    'icon' => 'verified_user',
+    'order' => 'Default',
+    'label' => __d('operation', 'EmailAddresses.verify.force'),
+    'if' => 'notVerified',
+    'link' => [
+      'action' => 'forceVerify',
+      $vv_obj->id
     ],
   ];
-}
+];
diff --git a/app/templates/Identifiers/fields-nav.inc b/app/templates/Identifiers/fields-nav.inc
diff --git a/app/templates/Names/fields-nav.inc b/app/templates/Names/fields-nav.inc
diff --git a/app/templates/Pronouns/fields-nav.inc b/app/templates/Pronouns/fields-nav.inc
diff --git a/app/templates/TelephoneNumbers/fields-nav.inc b/app/templates/TelephoneNumbers/fields-nav.inc
diff --git a/app/templates/Urls/fields-nav.inc b/app/templates/Urls/fields-nav.inc
diff --git a/app/webroot/js/comanage/components/common/actions.js b/app/webroot/js/comanage/components/common/actions.js
@@ -24,7 +24,6 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-<<<<<<< HEAD:app/webroot/js/comanage/components/common/actions.js
 import {
   constructLanguageString
 } from '../utils/helpers.js';
@@ -59,7 +58,3 @@ export default {
     </div>
   `
 }
-=======
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
->>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/templates/GroupNestings/fields-nav.inc