A free open source IT asset/license management system
Asset View/Audits: Added audit custom fields to audit view on asset detail page
snipe113f8903e92d
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.phpindex 2132e958f3..3a99734b24 100755--- a/app/Http/Controllers/Assets/AssetsController.php+++ b/app/Http/Controllers/Assets/AssetsController.php@@ -369,6 +369,22 @@ class AssetsController extends Controller$total_cost_for_asset = $asset->purchase_cost + $total_maintenance_cost + $total_asset_cost + $total_license_cost + $total_accessory_cost + $total_component_cost;+ $audit_custom_field_columns = [];+ if ($asset->model && $asset->model->fieldset) {+ $audit_custom_field_columns = $asset->model->fieldset->fields+ ->where('display_audit', '1')+ ->map(fn ($field) => [+ 'field' => $field->db_column,+ 'searchable' => false,+ 'sortable' => false,+ 'switchable' => true,+ 'title' => e($field->name),+ 'visible' => true,+ ])+ ->values()+ ->all();+ }+return view('hardware/view', compact('asset', 'qr_code', 'settings'))->with('total_maintenance_cost', $total_maintenance_cost)->with('total_asset_cost', $total_asset_cost)@@ -377,7 +393,8 @@ class AssetsController extends Controller->with('total_component_cost', $total_component_cost)->with('total_cost_for_asset', $total_cost_for_asset)->with('use_currency', $use_currency)- ->with('audit_log', $audit_log);+ ->with('audit_log', $audit_log)+ ->with('audit_custom_field_columns', $audit_custom_field_columns);}return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.phpindex a85115a75e..eb1e372347 100644--- a/app/Http/Transformers/ActionlogsTransformer.php+++ b/app/Http/Transformers/ActionlogsTransformer.php@@ -66,6 +66,7 @@ class ActionlogsTransformer}// This is necessary since we can't escape special characters within a JSON object+ $meta_array = null;if (($actionlog->log_meta) && ($actionlog->log_meta != '')) {$meta_array = json_decode($actionlog->log_meta);@@ -75,6 +76,11 @@ class ActionlogsTransformerforeach ($meta_array as $fieldname => $fieldata) {+ // Snapshot of audit-visible custom field values — handled separately below.+ if ($fieldname === '_audit_snapshot') {+ continue;+ }+$clean_meta[$fieldname]['old'] = $this->clean_field($fieldata->old);$clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new);@@ -193,8 +199,26 @@ class ActionlogsTransformer'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime') : Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),];- // Log::info("Clean Meta is: ".print_r($clean_meta,true));- // dd($array);+ // Expose audit-visible custom field values as top-level keys so the+ // audits datatable can bind each column directly to its field name.+ if ($actionlog->action_type === 'audit' && isset($meta_array->_audit_snapshot)) {+ foreach ($meta_array->_audit_snapshot as $fieldname => $value) {+ $field = $custom_fields->firstWhere('db_column', $fieldname);+ if ($field && $field->field_encrypted == '1') {+ if (Gate::allows('assets.view.encrypted_custom_fields')) {+ try {+ $array[$fieldname] = e(Crypt::decryptString($value));+ } catch (\Exception $e) {+ $array[$fieldname] = '************';+ }+ } else {+ $array[$fieldname] = '************';+ }+ } else {+ $array[$fieldname] = e($value);+ }+ }+ }return $array;}diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.phpindex 1a601c52e0..894c0b7e85 100644--- a/app/Models/Traits/Loggable.php+++ b/app/Models/Traits/Loggable.php@@ -378,16 +378,11 @@ trait Loggable$log = new Actionlog;- if (static::class == Asset::class) {- if ($asset = Asset::find($log->item_id)) {- // add the custom fields that were changed- if ($asset->model->fieldset) {- $fields_array = [];- foreach ($asset->model->fieldset->fields as $field) {- if ($field->display_audit == 1) {- $fields_array[$field->db_column] = $asset->{$field->db_column};- }- }+ $fields_array = [];+ if (static::class == Asset::class && $this->model && $this->model->fieldset) {+ foreach ($this->model->fieldset->fields as $field) {+ if ($field->display_audit == 1) {+ $fields_array[$field->db_column] = $this->{$field->db_column};}}}@@ -403,6 +398,10 @@ trait Loggable}}+ if (! empty($fields_array)) {+ $changed['_audit_snapshot'] = $fields_array;+ }+if (! empty($changed)) {$log->log_meta = json_encode($changed);}diff --git a/app/Presenters/HistoryPresenter.php b/app/Presenters/HistoryPresenter.phpindex 1eba76afce..9de6dc597f 100644--- a/app/Presenters/HistoryPresenter.php+++ b/app/Presenters/HistoryPresenter.php@@ -9,7 +9,7 @@ class HistoryPresenter extends Presenter** @return string*/- public static function dataTableLayout($hide_fields = [])+ public static function dataTableLayout($hide_fields = [], $extra_columns = []){$layout = [];@@ -230,6 +230,6 @@ class HistoryPresenter extends Presenter]);}- return json_encode($layout);+ return json_encode(array_merge($layout, $extra_columns));}}diff --git a/resources/views/blade/table/history.blade.php b/resources/views/blade/table/history.blade.phpindex 1d9c096f28..4f9a4d5b7a 100644--- a/resources/views/blade/table/history.blade.php+++ b/resources/views/blade/table/history.blade.php@@ -4,6 +4,7 @@'table_header' => trans('general.history'),'model' => null,'hide_fields' => [],+ 'extra_columns' => [],])<!-- start history tab pane -->@@ -13,7 +14,7 @@</x-slot:table_header><x-table- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout($hide_fields)"+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout($hide_fields, $extra_columns)"show_advanced_search="false"api_url="{{ $route }}"fixed_number="false"diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.phpindex e850ab3416..0caeea26a1 100755--- a/resources/views/hardware/view.blade.php+++ b/resources/views/hardware/view.blade.php@@ -402,7 +402,9 @@:table_header="trans('general.audits')":model="$asset":route="route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset', 'action_type' => 'audit'])"- :hide_fields="['id','action_type', 'item', 'changed', 'target','quantity','changed','serial','signature_file','log_meta']"/>+ :hide_fields="['id','action_type', 'item', 'changed', 'target','quantity','changed','serial','signature_file','log_meta']"+ :extra_columns="$audit_custom_field_columns"+ /></x-tabs.pane><!-- end audits tab pane -->