Consolidate fields-links.inc into fields-nav.inc (CFM-259) (#91)

COmanage · May 5, 2023 · 552291f · 552291f
1 parent c38e8ef
commit 552291f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/app/templates/Jobs/fields-links.inc → app/templates/Jobs/fields-nav.inc b/app/templates/Jobs/fields-links.inc → app/templates/Jobs/fields-nav.inc
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
@@ -40,16 +40,12 @@
 // Include subnavigation structures on add/edit/view pages
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of fields-nav.inc into fields.inc
 // When subnav exists, include on all Edit views and on Add/View for items with a parent.
-if($vv_action == 'edit' || !empty($vv_bc_parent_obj) || !empty($vv_primary_link_id)) {
+if($vv_action != 'add' || !empty($vv_bc_parent_obj) || !empty($vv_primary_link_id)) {
   if(file_exists(ROOT . DS . "templates" . DS . $modelsName . DS . "fields-nav.inc")) {
     include(ROOT . DS . "templates" . DS . $modelsName . DS . "fields-nav.inc");
   }  
 }
 
-if(file_exists(ROOT . DS . "templates" . DS . $modelsName . DS . "fields-links.inc")) {
-  include(ROOT . DS . "templates" . DS . $modelsName . DS . "fields-links.inc");
-} 
-
 // $linkFilter is used for models that belong to a specific parent model (eg: co_id)
 $linkFilter = [];