diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 277686c65..65338723c 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -52,6 +52,12 @@ class UsersController extends Controller
$users = $users->TextSearch($request->input('search'));
}
+
+ if (($request->has('deleted')) && ($request->input('deleted')=='true')) {
+ $users = $users->GetDeleted();
+ }
+
+
if ($request->has('company_id')) {
$users = $users->where('company_id', '=', $request->input('company_id'));
}
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index a2596f3a5..810372bfb 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -56,9 +56,10 @@ class UsersTransformer
];
$permissions_array['available_actions'] = [
- 'update' => Gate::allows('update', User::class) ? true : false,
- 'delete' => Gate::allows('delete', User::class) ? true : false,
- 'clone' => Gate::allows('create', User::class) ? true : false,
+ 'update' => (Gate::allows('update', User::class) && ($user->deleted_at=='')) ? true : false,
+ 'delete' => (Gate::allows('delete', User::class) && ($user->deleted_at=='')) ? true : false,
+ 'clone' => (Gate::allows('create', User::class) && ($user->deleted_at=='')) ,
+ 'restore' => (Gate::allows('create', User::class) && ($user->deleted_at!='')) ? true : false,
];
$array += $permissions_array;
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 82a2b01f2..4ea74216e 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -167,6 +167,10 @@ $('.snipe-table').bootstrapTable({
+ ' data-title="{{ trans('general.delete') }}" onClick="return false;">'
+ '';
}
+
+ if ((row.available_actions) && (row.available_actions.restore === true)) {
+ actions += ' ';
+ }
return actions;
};
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 2f8825adf..8d66b1d54 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -64,7 +64,7 @@
class="table table-striped snipe-table"
id="table"
data-url="{{ route('api.users.index',
- array(''=>e(Input::get('status')),'company_id'=>e(Input::get('company_id')))) }}"
+ array('deleted'=> (Input::get('status')=='deleted') ? 'true' : 'false','company_id'=>e(Input::get('company_id')))) }}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="userTableDisplay-{{ config('version.hash_version') }}">