DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into ignore_encrypt_and_other_changes

Browse source
This commit is contained in:
Godfrey Martinez 2023-08-23 00:42:59 -07:00 committed by GitHub
parent 0fc79ec936 d393bd5c97
commit 28cf533d19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -172,6 +172,7 @@ class ActionlogsTransformer
unset($clean_meta['location_id']); unset($clean_meta['location_id']);
} }
if(array_key_exists('model_id', $clean_meta)) { if(array_key_exists('model_id', $clean_meta)) {
$clean_meta['model_id']['old'] = "[id: ".$clean_meta['model_id']['old']."] ".$model->find($clean_meta['model_id']['old'])->name; $clean_meta['model_id']['old'] = "[id: ".$clean_meta['model_id']['old']."] ".$model->find($clean_meta['model_id']['old'])->name;
$clean_meta['model_id']['new'] = "[id: ".$clean_meta['model_id']['new']."] ".$model->find($clean_meta['model_id']['new'])->name; /* model is required at asset creation */ $clean_meta['model_id']['new'] = "[id: ".$clean_meta['model_id']['new']."] ".$model->find($clean_meta['model_id']['new'])->name; /* model is required at asset creation */
$clean_meta['Model'] = $clean_meta['model_id']; $clean_meta['Model'] = $clean_meta['model_id'];
@ -200,4 +201,4 @@ class ActionlogsTransformer
} }

6
database/migrations/2022_10_25_215520_add_label2_settings.php
View file

@ -21,11 +21,7 @@ class AddLabel2Settings extends Migration
$table->string('label2_1d_type')->default('default'); $table->string('label2_1d_type')->default('default');
$table->string('label2_2d_type')->default('default'); $table->string('label2_2d_type')->default('default');
$table->string('label2_2d_target')->default('hardware_id'); $table->string('label2_2d_target')->default('hardware_id');
$table->string('label2_fields')->default( $table->string('label2_fields')->default('name=name;serial=serial;model=model.name;');
trans('admin/hardware/form.name').'=name;'.
trans('admin/hardware/form.serial').'=serial;'.
trans('admin/hardware/form.model').'=model.name;'
);
}); });
} }