From 9072f7c6c9e10081ab0323abab3b9d37879b9a18 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Jun 2022 12:49:50 -0700 Subject: [PATCH 1/3] Added click-to-select to tables Signed-off-by: snipe --- resources/views/categories/view.blade.php | 1 + resources/views/locations/view.blade.php | 4 +++- resources/views/models/view.blade.php | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php index da37e4991..b32bb8df0 100644 --- a/resources/views/categories/view.blade.php +++ b/resources/views/categories/view.blade.php @@ -71,6 +71,7 @@ data-toolbar="#assetsBulkEditToolbar" data-bulk-button-id="#bulkAssetEditButton" data-bulk-form-id="#assetsBulkForm" + data-click-to-select="true" data-export-options='{ "fileName": "export-{{ str_slug($category->name) }}-assets-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php index cd203fb90..b548062b4 100644 --- a/resources/views/locations/view.blade.php +++ b/resources/views/locations/view.blade.php @@ -90,7 +90,7 @@ data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}" data-cookie-id-table="usersTable" data-pagination="true" - data-id-table="#usersTable" + data-id-table="usersTable" data-search="true" data-side-pagination="server" data-show-columns="true" @@ -100,6 +100,7 @@ data-toolbar="#userBulkEditToolbar" data-bulk-button-id="#bulkUserEditButton" data-bulk-form-id="#usersBulkForm" + data-click-to-select="true" id="usersTable" class="table table-striped snipe-table" data-url="{{route('api.users.index', ['location_id' => $location->id])}}" @@ -131,6 +132,7 @@ data-toolbar="#assetsBulkEditToolbar" data-bulk-button-id="#bulkAssetEditButton" data-bulk-form-id="#assetsBulkForm" + data-click-to-select="true" id="assetsListingTable" class="table table-striped snipe-table" data-url="{{route('api.assets.index', ['location_id' => $location->id]) }}" diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 0027f61cd..b52805d15 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -59,6 +59,7 @@ data-toolbar="#assetsBulkEditToolbar" data-bulk-button-id="#bulkAssetEditButton" data-bulk-form-id="#assetsBulkForm" + data-click-to-select="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" From 88dfdb753852a7fa070ddadfdce1cf9739412dff Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Jun 2022 12:50:10 -0700 Subject: [PATCH 2/3] Fixed bug in uncheck Signed-off-by: snipe --- resources/views/partials/bootstrap-table.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index f0bebb4bb..d71fe3253 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -124,8 +124,7 @@ $('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) { var tableId = $(this).data('id-table'); - $( "#" + tableId + "checkbox_" + $element.id).remove(); - console.log("#" + tableId + "checkbox_" + $element.id); + $( "#" + tableId + "_checkbox_" + $element.id).remove(); }); From f1a63f25e72e6ef19b425e045017f2236c7db50e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Jun 2022 12:50:26 -0700 Subject: [PATCH 3/3] Partialize and add data atributes to statuslabel bulk Signed-off-by: snipe --- resources/views/statuslabels/view.blade.php | 22 +++++---------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php index c7c7716b5..3ddacd147 100644 --- a/resources/views/statuslabels/view.blade.php +++ b/resources/views/statuslabels/view.blade.php @@ -12,23 +12,7 @@
- {{ Form::open([ - 'method' => 'POST', - 'route' => ['hardware/bulkedit'], - 'class' => 'form-inline', - 'id' => 'bulkForm']) }} -
-
- @if (Request::get('status')!='Deleted') -
- - -
- @endif + @include('partials.asset-bulk-actions')