From 962e7531a62ddb5ed88cb0dcf2ace6e7c905ca84 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 6 Jan 2016 18:04:55 -0800
Subject: [PATCH] Fix for changing asset model from model with custom fields to
 one without

---
 app/config/version.php                     | 2 +-
 app/controllers/admin/AssetsController.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 2652e138ad..a8c6c62476 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.1.0-pre',
-  'hash_version' => 'v2.1.0-pre-14-g2b13641',
+  'hash_version' => 'v2.1.0-pre-15-g218fe72',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 897d2556ac..aa5bcb90b5 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -290,13 +290,14 @@ class AssetsController extends AdminController
         $input=Input::all();
         // return "INPUT IS: <pre>".print_r($input,true)."</pre>";
         $rules=$asset->validationRules($assetId);
-        if($asset->model->fieldset)
+        $model=Model::find(e(Input::get('model_id'))); //validate by the NEW model's custom fields, not the current one
+        if($model->fieldset)
         {
-          foreach($asset->model->fieldset->fields AS $field) {
+          foreach($model->fieldset->fields AS $field) {
             $input[$field->db_column_name()]=$input['fields'][$field->db_column_name()];
             $asset->{$field->db_column_name()}=$input[$field->db_column_name()];
           }
-          $rules+=$asset->model->fieldset->validation_rules();
+          $rules+=$model->fieldset->validation_rules();
           unset($input['fields']);
         }