lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Better handling for deleted users

Browse source
This commit is contained in:
snipe 2016-08-02 04:23:13 -07:00
parent 66ad0f1d4c
commit 39929c7d89
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/UsersController.php
View file

@ -1233,9 +1233,7 @@ class UsersController extends Controller
$item["note"] = $item["createorupdate"]; $item["note"] = $item["createorupdate"];
$item["status"]='success'; $item["status"]='success';
} else { } else {
//$errors_array = array($user->getErrors());
foreach ($user->getErrors()->getMessages() as $key => $err) { foreach ($user->getErrors()->getMessages() as $key => $err) {
//echo $user->getErrors();
$errors .='<li>'.$err[0]; $errors .='<li>'.$err[0];
} }
$item["note"] = $errors; $item["note"] = $errors;

4
config/version.php
View file

@ -1,5 +1,5 @@
<?php <?php
return array ( return array (
'app_version' => 'v3.1', 'app_version' => 'v3.1.0',
'hash_version' => 'v3.1-95-gde17da0', 'hash_version' => 'v3.1.0-29-gd6ba0b6',
); );

10
resources/views/hardware/view.blade.php
View file

@ -476,14 +476,18 @@
<tr> <tr>
<td>{{ $log->created_at }}</td> <td>{{ $log->created_at }}</td>
<td> <td>
@if (isset($log->user_id)) @if (isset($log->adminlog))
{{ $log->adminlog->fullName() }} {{ $log->adminlog->fullName() }}
@else
Deleted Admin
@endif @endif
</td> </td>
<td>{{ $log->action_type }}</td> <td>{{ $log->action_type }}</td>
<td> <td>
@if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!='')) @if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!=''))
@if ($log->userlog)
@if ($log->userlog->deleted_at=='') @if ($log->userlog->deleted_at=='')
<a href="{{ route('view/user', $log->checkedout_to) }}"> <a href="{{ route('view/user', $log->checkedout_to) }}">
{{ $log->userlog->fullName() }} {{ $log->userlog->fullName() }}
@ -491,7 +495,9 @@
@else @else
<del>{{ $log->userlog->fullName() }}</del> <del>{{ $log->userlog->fullName() }}</del>
@endif @endif
@else
Deleted User
@endif
@endif @endif
</td> </td>
<td> <td>