From 5a86004081415c8a498d64c3d2e05294cda4b48a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 13 Jun 2022 20:29:08 -0700 Subject: [PATCH 1/7] Created new models bulk edit partial Signed-off-by: snipe --- .../partials/models-bulk-actions.blade.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 resources/views/partials/models-bulk-actions.blade.php diff --git a/resources/views/partials/models-bulk-actions.blade.php b/resources/views/partials/models-bulk-actions.blade.php new file mode 100644 index 0000000000..d8a3f202c7 --- /dev/null +++ b/resources/views/partials/models-bulk-actions.blade.php @@ -0,0 +1,23 @@ +
+ {{ Form::open([ + 'method' => 'POST', + 'route' => ['models.bulkedit.index'], + 'class' => 'form-inline', + 'id' => 'modelsBulkForm']) }} + + @if (request('status')!='deleted') + @can('delete', \App\Models\User::class) +
+ + + +
+ @endcan + @endif + {{ Form::close() }} +
+ + From 10781a6e4b3e01ebfed29c7bab1c466107947035 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 13 Jun 2022 20:29:17 -0700 Subject: [PATCH 2/7] Use new bulk edit partial Signed-off-by: snipe --- resources/views/models/index.blade.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php index 8cda15ca40..eff6a5dfe5 100755 --- a/resources/views/models/index.blade.php +++ b/resources/views/models/index.blade.php @@ -36,24 +36,7 @@
- {{ Form::open([ - 'method' => 'POST', - 'route' => ['models.bulkedit.index'], - 'class' => 'form-inline', - 'id' => 'modelsBulkForm']) }} -
-
- - @if (Request::get('status')!='deleted') -
- - - -
- @endif + @include('partials.models-bulk-actions')
Date: Mon, 13 Jun 2022 20:30:35 -0700 Subject: [PATCH 3/7] Fixed issue in BS tables where uncheck-all then checking a few would not uncheck properly Signed-off-by: snipe --- resources/views/partials/bootstrap-table.blade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 588eaa9160..f0bebb4bb2 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -123,7 +123,9 @@ }); $('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) { - $( "#checkbox_" + $element.id).remove(); + var tableId = $(this).data('id-table'); + $( "#" + tableId + "checkbox_" + $element.id).remove(); + console.log("#" + tableId + "checkbox_" + $element.id); }); @@ -157,7 +159,7 @@ var tableId = $(this).data('id-table'); for (var i in rowsBefore) { - $( tableId + "_checkbox_" + rowsBefore[i].id).remove(); + $('#' + tableId + "_checkbox_" + rowsBefore[i].id).remove(); } }); From 5496b62b33534bae45d6e2c0bc53cd7148416f53 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 13 Jun 2022 20:30:50 -0700 Subject: [PATCH 4/7] Split categories into two tabs if the type = asset Signed-off-by: snipe --- resources/views/categories/view.blade.php | 182 +++++++++++++++------- 1 file changed, 127 insertions(+), 55 deletions(-) diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php index 2cf0960c9b..e33290a4cc 100644 --- a/resources/views/categories/view.blade.php +++ b/resources/views/categories/view.blade.php @@ -24,83 +24,155 @@ {{-- Page content --}} @section('content') -
-
-
-
- @if ($category->category_type=='asset') - @include('partials.asset-bulk-actions') - @endif -
category_type=='asset') +
+
- data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" - data-cookie-id-table="categoryAssetsTable" - id="categoryAssetsTable" - data-id-table="categoryAssetsTable" - data-export-options='{ +
+ +
+
+
+
+
+ @if ($category->category_type=='asset') + @include('partials.asset-bulk-actions') + @endif + +
category_type=='asset') + + data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" + data-cookie-id-table="categoryAssetsTable" + id="categoryAssetsTable" + data-id-table="categoryAssetsTable" + data-toolbar="#assetsBulkEditToolbar" + data-bulk-button-id="#bulkAssetEditButton" + data-bulk-form-id="#assetsBulkForm" + data-export-options='{ "fileName": "export-{{ str_slug($category->name) }}-assets-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - @elseif ($category->category_type=='accessory') - data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}" - data-cookie-id-table="categoryAccessoryTable" - id="categoryAccessoryTable" - data-id-table="categoryAccessoryTable" - data-export-options='{ + @elseif ($category->category_type=='accessory') + data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}" + data-cookie-id-table="categoryAccessoryTable" + id="categoryAccessoryTable" + data-id-table="categoryAccessoryTable" + data-export-options='{ "fileName": "export-{{ str_slug($category->name) }}-accessories-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - @elseif ($category->category_type=='consumable') - data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}" - data-cookie-id-table="categoryConsumableTable" - id="categoryConsumableTable" - data-id-table="categoryConsumableTable" - data-export-options='{ + @elseif ($category->category_type=='consumable') + data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}" + data-cookie-id-table="categoryConsumableTable" + id="categoryConsumableTable" + data-id-table="categoryConsumableTable" + data-export-options='{ "fileName": "export-{{ str_slug($category->name) }}-consumables-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - @elseif ($category->category_type=='component') - data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}" - data-cookie-id-table="categoryCompomnentTable" - id="categoryCompomnentTable" - data-id-table="categoryCompomnentTable" - data-export-options='{ + @elseif ($category->category_type=='component') + data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}" + data-cookie-id-table="categoryCompomnentTable" + id="categoryCompomnentTable" + data-id-table="categoryCompomnentTable" + data-export-options='{ "fileName": "export-{{ str_slug($category->name) }}-components-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - @elseif ($category->category_type=='license') - data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}" - data-cookie-id-table="categoryLicenseTable" - id="categoryLicenseTable" - data-id-table="categoryLicenseTable" - data-export-options='{ + @elseif ($category->category_type=='license') + data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}" + data-cookie-id-table="categoryLicenseTable" + id="categoryLicenseTable" + data-id-table="categoryLicenseTable" + data-export-options='{ "fileName": "export-{{ str_slug($category->name) }}-licenses-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }' - @endif + @endif - data-pagination="true" - data-search="true" - data-show-footer="true" - data-side-pagination="server" - data-show-columns="true" - data-show-export="true" - data-show-refresh="true" - data-sort-order="asc" - class="table table-striped snipe-table" - data-url="{{ route('api.'.$category_type_route.'.index',['category_id'=> $category->id]) }}"> - -
+ data-pagination="true" + data-search="true" + data-show-footer="true" + data-side-pagination="server" + data-show-columns="true" + data-show-export="true" + data-show-refresh="true" + data-sort-order="asc" + class="table table-striped snipe-table" + data-url="{{ route('api.'.$category_type_route.'.index',['category_id'=> $category->id]) }}"> -
-
-
-
+ +
+ + + + +
+
+
+ + @if ($category->models->count() > 0) + @if ($category->category_type=='asset') + @include('partials.models-bulk-actions') + @endif + @endif + + +
+ +
+
+
+ + + + + @stop + + + + @section('moar_scripts') @include ('partials.bootstrap-table') @stop From aec033d8d2cd8739022214378f7a90bac8302eae Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 13 Jun 2022 20:33:37 -0700 Subject: [PATCH 5/7] Use better phrasing for tab Signed-off-by: snipe --- resources/views/categories/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php index e33290a4cc..cbc4d48d64 100644 --- a/resources/views/categories/view.blade.php +++ b/resources/views/categories/view.blade.php @@ -32,7 +32,7 @@