Better handling for deleted users

snipe · Aug 2, 2016 · 39929c7 · 39929c7
1 parent 66ad0f1
commit 39929c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -1233,9 +1233,7 @@ public function postLDAP(Request $request)
  $item["note"] = $item["createorupdate"];
  $item["status"]='success';
  } else {
- //$errors_array = array($user->getErrors());
  foreach ($user->getErrors()->getMessages() as $key => $err) {
- //echo $user->getErrors();
  $errors .='<li>'.$err[0];
  }
  $item["note"] = $errors;

diff --git a/config/version.php b/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
- 'app_version' => 'v3.1',
- 'hash_version' => 'v3.1-95-gde17da0',
-);
+ 'app_version' => 'v3.1.0',
+ 'hash_version' => 'v3.1.0-29-gd6ba0b6',
+);
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
@@ -476,22 +476,28 @@
  <tr>
  <td>{{ $log->created_at }}</td>
  <td>
- @if (isset($log->user_id))
+ @if (isset($log->adminlog))
  {{ $log->adminlog->fullName() }}
+ @else
+ Deleted Admin
  @endif
  </td>
  <td>{{ $log->action_type }}</td>
  <td>
  @if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!=''))
 
- @if ($log->userlog->deleted_at=='')
+ @if ($log->userlog)
+
+ @if ($log->userlog->deleted_at=='')
  <a href="{{ route('view/user', $log->checkedout_to) }}">
  {{ $log->userlog->fullName() }}
  </a>
- @else
- <del>{{ $log->userlog->fullName() }}</del>
- @endif
-
+ @else
+ <del>{{ $log->userlog->fullName() }}</del>
+ @endif
+ @else
+ Deleted User
+ @endif
  @endif
  </td>
  <td>