- {{ Form::open([
- 'method' => 'POST',
- 'route' => ['hardware/bulkedit'],
- 'class' => 'form-inline',
- 'id' => 'bulkForm']) }}
+
+
@if (Request::get('status')!='Deleted')
-
- {{ Form::close() }}
+
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 7caa1ef57cb8..660b683ac8a6 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -9,14 +9,17 @@
{{-- Right header --}}
@section('header_right')
+
@can('manage', \App\Models\Asset::class)
+ @if ($asset->deleted_at=='')
@@ -1114,7 +1168,7 @@ class="table table-striped snipe-table"
@can('update', \App\Models\Asset::class)
-
+
@endcan
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index b1c1dab87314..16b2040a4cb6 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -69,7 +69,7 @@
data-sort-order="asc"
id="asssetModelsTable"
class="table table-striped snipe-table"
- data-url="{{ route('api.models.index') }}"
+ data-url="{{ route('api.models.index', ['status' => request('status')]) }}"
data-export-options='{
"fileName": "export-models-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 3d90ff4d893b..7ad14bf9059f 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -80,7 +80,8 @@ classes: 'table table-responsive table-no-bordered',
$('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
}
- });
+ });
+
});
@@ -95,25 +96,47 @@ function dateRowCheckStyle(value) {
}
- // Handle whether or not the edit button should be disabled
- $('.snipe-table').on('check.bs.table', function () {
+ // These methods dynamically add/remove hidden input values in the bulk actions form
+ $('.snipe-table').on('check.bs.table .btSelectItem', function (row, $element) {
$('#bulkEdit').removeAttr('disabled');
+ $('#bulkEdit').prepend('');
});
- $('.snipe-table').on('check-all.bs.table', function () {
- $('#bulkEdit').removeAttr('disabled');
+ $('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) {
+ $( "#checkbox_" + $element.id).remove();
});
+
+ // Handle whether or not the edit button should be disabled
$('.snipe-table').on('uncheck.bs.table', function () {
if ($('.snipe-table').bootstrapTable('getSelections').length == 0) {
$('#bulkEdit').attr('disabled', 'disabled');
}
});
- $('.snipe-table').on('uncheck-all.bs.table', function (e, row) {
+ $('.snipe-table').on('uncheck-all.bs.table', function (event, rowsAfter, rowsBefore) {
$('#bulkEdit').attr('disabled', 'disabled');
+ //console.dir(rowsBefore);
+
+ for (var i in rowsBefore) {
+ $( "#checkbox_" + rowsBefore[i].id).remove();
+ }
+
});
+ $('.snipe-table').on('check-all.bs.table', function (event, rowsAfter, rowsBefore) {
+
+ $('#bulkEdit').removeAttr('disabled');
+ //console.dir(rowsAfter);
+
+ for (var i in rowsAfter) {
+ // console.log(rowsAfter[i].id);
+ $('#bulkEdit').prepend('');
+ }
+ });
+
+
+
// This only works for model index pages because it uses the row's model ID
function genericRowLinkFormatter(destination) {
return function (value,row) {
@@ -209,7 +232,7 @@ function genericActionsFormatter(owner_name, element_name) {
}
if ((row.available_actions) && (row.available_actions.update === true)) {
- actions += 'Update ';
+ actions += '{{ trans('general.update') }} ';
}
if ((row.available_actions) && (row.available_actions.delete === true)) {
@@ -218,13 +241,17 @@ function genericActionsFormatter(owner_name, element_name) {
+ ' data-toggle="modal" '
+ ' data-content="{{ trans('general.sure_to_delete') }} ' + row.name + '?" '
+ ' data-title="{{ trans('general.delete') }}" onClick="return false;">'
- + 'Delete ';
+ + '{{ trans('general.delete') }} ';
} else {
actions += ' ';
}
+
if ((row.available_actions) && (row.available_actions.restore === true)) {
- actions += ' ';
+ actions += ' ';
}
actions +='';
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 6d0dc7993905..cdbcc6d98647 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -114,13 +114,11 @@
@endif
-
-
-
-
-
+
+
+
+
+ {{ Form::open([
+ 'method' => 'POST',
+ 'route' => ['hardware/bulkedit'],
+ 'class' => 'form-inline',
+ 'id' => 'bulkForm']) }}
+
+
+
+
+
+
+ {{ Form::close() }}
+
+
@endif
| {{ $component->pivot->assigned_qty }} | {{ Helper::formatCurrencyOutput($component->purchase_cost) }} each | + purchase_cost *$component->pivot->assigned_qty) ?> @endif @@ -885,7 +939,7 @@||
| - | {{ Helper::formatCurrencyOutput($totalCost) }} | +{{ $totalCost }} | |
{{ trans('admin/users/message.user_deleted_warning') }}
- @can('update', $user)
- {{ trans('admin/users/general.restore_user') }}
- @endcan
+
+
@if ($user->avatar)
@else
@@ -377,7 +375,12 @@
@else
@else
@@ -377,7 +375,12 @@
-
+ @if ($user->deleted_at!='')
+
+ @endif
@endif
@endcan
@@ -573,7 +576,7 @@ class="table table-striped snipe-table table-hover"
-
+
| {{ trans('general.notes') }} | @@ -651,7 +654,7 @@ class="table table-striped snipe-table"
|---|
| {{ trans('general.name') }} | diff --git a/routes/web.php b/routes/web.php index 21600d9f1137..44967d986cc0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -39,7 +39,7 @@ Route::group([ 'prefix' => 'manufacturers', 'middleware' => ['auth'] ], function () { - Route::get('{manufacturers_id}/restore', [ 'as' => 'restore/manufacturer', 'uses' => 'ManufacturersController@restore']); + Route::post('{manufacturers_id}/restore', [ 'as' => 'restore/manufacturer', 'uses' => 'ManufacturersController@restore']); }); Route::resource('manufacturers', 'ManufacturersController', [ diff --git a/routes/web/hardware.php b/routes/web/hardware.php index a5d6258b3bd9..bdcfd52ff903 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -131,7 +131,7 @@ function () { ]); Route::get('{assetId}/qr_code', [ 'as' => 'qr_code/hardware', 'uses' => 'Assets\AssetsController@getQrCode' ]); Route::get('{assetId}/barcode', [ 'as' => 'barcode/hardware', 'uses' => 'Assets\AssetsController@getBarCode' ]); - Route::get('{assetId}/restore', [ + Route::post('{assetId}/restore', [ 'as' => 'restore/hardware', 'uses' => 'Assets\AssetsController@getRestore' ]); diff --git a/routes/web/models.php b/routes/web/models.php index a491c395daf3..42a12d6813ca 100644 --- a/routes/web/models.php +++ b/routes/web/models.php @@ -6,7 +6,7 @@ Route::get('{modelId}/clone', [ 'as' => 'clone/model', 'uses' => 'AssetModelsController@getClone' ]); Route::post('{modelId}/clone', 'AssetModelsController@postCreate'); Route::get('{modelId}/view', [ 'as' => 'view/model', 'uses' => 'AssetModelsController@getView' ]); - Route::get('{modelID}/restore', [ 'as' => 'restore/model', 'uses' => 'AssetModelsController@getRestore', 'middleware' => ['authorize:superuser'] ]); + Route::post('{modelID}/restore', [ 'as' => 'restore/model', 'uses' => 'AssetModelsController@getRestore', 'middleware' => ['authorize:superuser'] ]); Route::get('{modelId}/custom_fields', ['as' => 'custom_fields/model','uses' => 'AssetModelsController@getCustomFields']); Route::post('bulkedit', ['as' => 'models.bulkedit.index','uses' => 'BulkAssetModelsController@edit']); Route::post('bulksave', ['as' => 'models.bulkedit.store','uses' => 'BulkAssetModelsController@update']); diff --git a/routes/web/users.php b/routes/web/users.php index fd0ef77158f4..d4dcd4265a05 100644 --- a/routes/web/users.php +++ b/routes/web/users.php @@ -8,7 +8,7 @@ Route::get('export', [ 'as' => 'users.export', 'uses' => 'Users\UsersController@getExportUserCsv' ]); Route::get('{userId}/clone', [ 'as' => 'clone/user', 'uses' => 'Users\UsersController@getClone' ]); Route::post('{userId}/clone', [ 'uses' => 'Users\UsersController@postCreate' ]); - Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'Users\UsersController@getRestore' ]); + Route::post('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'Users\UsersController@getRestore' ]); Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'Users\UsersController@getUnsuspend' ]); Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'Users\UserFilesController@store' ]); Route::delete(
|---|