From ab52a35da7159975d8401bb04047e9d18051c0f4 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 13 Jul 2022 14:19:53 -0400
Subject: [PATCH] Replace vv_entity_id with existing vv_obj reference.
 (CFM-193)

---
 app/src/Controller/StandardController.php | 2 --
 app/templates/Standard/add-edit-view.php  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index 4dac86cf4..280e311cf 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -330,7 +330,6 @@ public function edit(string $id) {
         $this->set('vv_title', __d('operation', 'edit.ai', __d('controller', $modelsName, [1])));
       }
     }
-    $this->set('vv_entity_id', __d('information', 'entity.id', $id));
     
     // Let the view render
     $this->render('/Standard/add-edit-view');
@@ -660,7 +659,6 @@ public function view($id = null) {
         $this->set('vv_title', __d('operation', 'view.ai', __d('controller', $modelsName, [1])));
       }
     }
-    $this->set('vv_entity_id', __d('information', 'entity.id', $id));
     
     // Let the view render
     $this->render('/Standard/add-edit-view');
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index dc90552c2..4d0d43a45 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -134,7 +134,7 @@
   }
 }
 
-print '<li id="cm-entity-id">' . $vv_entity_id . '</li>'; 
+print '<li id="cm-entity-id">' . __d('information', 'entity.id', $vv_obj->id) . '</li>'; 
 
 if($vv_action == 'add' || $vv_action == 'edit') {
   // We don't want/need to output these for view actions