ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for changing asset model from model with custom fields to one without

Browse Source
This commit is contained in:
snipe
2016-01-06 18:04:55 -08:00
parent e8e8e8f4f3
commit 962e7531a6
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+1 -1
View File
@@ -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',
);
app/controllers/admin/AssetsController.php
+4 -3
View File
@@ -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']);
}