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

Set a user_id of -1 if there isn't a logged in user. This fixes the CLI importer, and opens the door in the future for some sort of virtual importer user... which may fix other issues the importer currently has (#2775)

Browse Source
This commit is contained in:
Daniel Meltzer
2016-10-17 13:07:08 -05:00
committed by snipe
parent 0a0006c68c
commit 85af8e46e3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ReportsController.php
View File

@@ -371,25 +371,25 @@ class ReportsController extends Controller
if($activity->target) {
$activity_target = '<a href="'.route('view/hardware', $activity->target_id).'">'.$activity->target->showAssetName().'</a>';
} else {
$activity_target = "Unknown Item";
$activity_target = "";
}
} elseif ( $activity->target_type === "App\Models\User") {
if($activity->target()) {
$activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->target->fullName().'</a>';
} else {
$activity_target = 'Unknown User';
$activity_target = '';
}
} elseif ($activity->action_type=='requested') {
if ($activity->user) {
$activity_target = '<a href="'.route('view/user', $activity->user_id).'">'.$activity->user->fullName().'</a>';
} else {
$activity_target = 'Unknown User';
$activity_target = '';
}
} else {
if($activity->target) {
$activity_target = $activity->target->id;
} else {
$activity_target = "Unknown";
$activity_target = "";
}
}

10
app/Models/Loggable.php
View File

@@ -83,11 +83,15 @@ trait Loggable
/**
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
* @since [v3.4]
* @since [v3.5]
* @return \App\Models\Actionlog
*/
public function logCreate($note = null)
{
$user_id = -1;
if (Auth::user()) {
$user_id = Auth::user()->id;
}
$log = new Actionlog;
if (static::class == LicenseSeat::class) {
$log->item_type = License::class;
@@ -98,9 +102,9 @@ trait Loggable
}
$log->location_id = null;
$log->note = $note;
$log->user_id = Auth::user()->id;
$log->user_id = $user_id;
$log->logaction('created');
$log->save();
return $log;
}