From 7d5347d749b5028a955b75083cc0fe61e73e7bd7 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Fri, 5 May 2023 08:12:23 -0400
Subject: [PATCH] Consolidate fields-links.inc into fields-nav.inc (CFM-259)

---
 app/templates/Jobs/{fields-links.inc => fields-nav.inc} | 0
 app/templates/Standard/add-edit-view.php                | 6 +-----
 2 files changed, 1 insertion(+), 5 deletions(-)
 rename app/templates/Jobs/{fields-links.inc => fields-nav.inc} (100%)

diff --git a/app/templates/Jobs/fields-links.inc b/app/templates/Jobs/fields-nav.inc
similarity index 100%
rename from app/templates/Jobs/fields-links.inc
rename to app/templates/Jobs/fields-nav.inc
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index a98dee8a5..c0e588e8c 100644
--- 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 = [];