From 4e4ba380385ed2abb6ee566b402ba58424fc4201 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Mon, 28 Aug 2023 16:23:26 -0600
Subject: [PATCH] Pass the model_id variable in the controller and get it only
 if we are cloning the asset model

---
 app/Http/Controllers/AssetModelsController.php | 1 +
 resources/views/models/edit.blade.php          | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index dbefb2e7b7..7b1f3c49ba 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -286,6 +286,7 @@ class AssetModelsController extends Controller
         return view('models/edit')
             ->with('depreciation_list', Helper::depreciationList())
             ->with('item', $model)
+            ->with('model_id', $model_to_clone->id)
             ->with('clone_model', $model_to_clone);
     }
 
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 8d33f94b15..4bb5cac6c0 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -33,14 +33,9 @@
     </div>
 </div>
 
-@php
-    $model_id = $item->id;
-    if (is_null($model_id)){
-        $model_id = $item->getOriginal('id');
-    }
-@endphp
 <!-- Custom Fieldset -->
-@livewire('custom-field-set-default-values-for-model',["model_id" => $model_id])
+<!-- If $item->id is null we are cloning the model and we need the $model_id variable -->
+@livewire('custom-field-set-default-values-for-model',["model_id" => ($item->id) ? $item->id : $model_id])
 
 @include ('partials.forms.edit.notes')
 @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])