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

Fixes issue related to #471 - assigning to user ID 0 causes erro

Browse Source
This commit is contained in:
snipe
2015-01-23 15:38:39 -08:00
parent 3787a3f4ba
commit 950567e9d6
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+10 -8
View File
@@ -174,7 +174,7 @@ class AssetsController extends AdminController
}
if (e(Input::get('assigned_to')) == '') {
$asset->assigned_to = 0;
$asset->assigned_to = NULL;
} else {
$asset->assigned_to = e(Input::get('assigned_to'));
}
@@ -213,13 +213,15 @@ class AssetsController extends AdminController
// Was the asset created?
if($asset->save()) {
$logaction = new Actionlog();
$logaction->asset_id = $asset->id;
$logaction->checkedout_to = $asset->assigned_to;
$logaction->asset_type = 'hardware';
$logaction->user_id = Sentry::getUser()->id;
$logaction->note = e(Input::get('note'));
$log = $logaction->logaction('checkout');
if (Input::get('assigned_to')!='') {
$logaction = new Actionlog();
$logaction->asset_id = $asset->id;
$logaction->checkedout_to = $asset->assigned_to;
$logaction->asset_type = 'hardware';
$logaction->user_id = Sentry::getUser()->id;
$logaction->note = e(Input::get('note'));
$log = $logaction->logaction('checkout');
}
// Redirect to the asset listing page
return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
app/views/backend/hardware/view.blade.php
+3 -1
View File
@@ -191,6 +191,7 @@
<tbody>
@if (count($asset->assetlog) > 0)
@foreach ($asset->assetlog as $log)
@if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0))
<tr>
<td>{{{ $log->added_on }}}</td>
<td>
@@ -199,7 +200,7 @@
</td>
<td>{{ $log->action_type }}</td>
<td>
@if (isset($log->checkedout_to))
@if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0))
<a href="{{ route('view/user', $log->checkedout_to) }}">
{{{ $log->userlog->fullName() }}}
</a>
@@ -210,6 +211,7 @@
@endif
</td>
</tr>
@endif
@endforeach
@endif
<tr>