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

Updated loggable to check for custom fields that were passed for meta

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-02-22 18:12:30 +00:00
parent da77ddd447
commit c611cb5612
1 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/Models/Loggable.php
View file

@ -34,7 +34,11 @@ trait Loggable
*/ */
public function logCheckout($note, $target, $action_date = null, $originalValues = []) public function logCheckout($note, $target, $action_date = null, $originalValues = [])
{ {
$log = new Actionlog; $log = new Actionlog;
$fields_array = [];
$log = $this->determineLogItemType($log); $log = $this->determineLogItemType($log);
if (auth()->user()) { if (auth()->user()) {
$log->created_by = auth()->id(); $log->created_by = auth()->id();
@ -55,6 +59,7 @@ trait Loggable
$log->target_type = get_class($target); $log->target_type = get_class($target);
$log->target_id = $target->id; $log->target_id = $target->id;
// Figure out what the target is // Figure out what the target is
if ($log->target_type == Location::class) { if ($log->target_type == Location::class) {
$log->location_id = $target->id; $log->location_id = $target->id;
@ -64,6 +69,21 @@ trait Loggable
$log->location_id = $target->location_id; $log->location_id = $target->location_id;
} }
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_checkout == 1) {
$fields_array[$field->db_column] = $asset->{$field->db_column};
}
}
}
}
}
$log->note = $note; $log->note = $note;
$log->action_date = $action_date; $log->action_date = $action_date;
@ -72,7 +92,10 @@ trait Loggable
} }
$changed = []; $changed = [];
$originalValues = array_intersect_key($originalValues, array_flip(['action_date','name','status_id','location_id','expected_checkin'])); $array_to_flip = array_keys($fields_array);
$array_to_flip = array_merge($array_to_flip, ['action_date','name','status_id','location_id','expected_checkin']);
$originalValues = array_intersect_key($originalValues, array_flip($array_to_flip));
foreach ($originalValues as $key => $value) { foreach ($originalValues as $key => $value) {
if ($key == 'action_date' && $value != $action_date) { if ($key == 'action_date' && $value != $action_date) {
@ -119,6 +142,8 @@ trait Loggable
{ {
$log = new Actionlog; $log = new Actionlog;
$fields_array = [];
if($target != null){ if($target != null){
$log->target_type = get_class($target); $log->target_type = get_class($target);
$log->target_id = $target->id; $log->target_id = $target->id;
@ -135,6 +160,16 @@ trait Loggable
if (static::class == Asset::class) { if (static::class == Asset::class) {
if ($asset = Asset::find($log->item_id)) { if ($asset = Asset::find($log->item_id)) {
$asset->increment('checkin_counter', 1); $asset->increment('checkin_counter', 1);
// add the custom fields that were changed
if ($asset->model->fieldset) {
$fields_array = [];
foreach ($asset->model->fieldset->fields as $field) {
if ($field->display_checkin == 1) {
$fields_array[$field->db_column] = $asset->{$field->db_column};
}
}
}
} }
} }
} }
@ -152,9 +187,14 @@ trait Loggable
} }
$changed = []; $changed = [];
$originalValues = array_intersect_key($originalValues, array_flip(['action_date','name','status_id','location_id','rtd_location_id','expected_checkin']));
$array_to_flip = array_keys($fields_array);
$array_to_flip = array_merge($array_to_flip, ['action_date','name','status_id','location_id','expected_checkin']);
$originalValues = array_intersect_key($originalValues, array_flip($array_to_flip));
foreach ($originalValues as $key => $value) { foreach ($originalValues as $key => $value) {
if ($key == 'action_date' && $value != $action_date) { if ($key == 'action_date' && $value != $action_date) {
$changed[$key]['old'] = $value; $changed[$key]['old'] = $value;
$changed[$key]['new'] = is_string($action_date) ? $action_date : $action_date->format('Y-m-d H:i:s'); $changed[$key]['new'] = is_string($action_date) ? $action_date : $action_date->format('Y-m-d H:i:s');