From 5d14acaac481323460bf78b4ff31d10a29677883 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 Jan 2017 07:40:40 -0800 Subject: [PATCH] Fixed bulk actions using native bootstrap-tables checkall --- resources/views/hardware/index.blade.php | 58 +++++++++++++------ .../views/partials/bootstrap-table.blade.php | 1 - resources/views/users/index.blade.php | 33 ++++++----- 3 files changed, 61 insertions(+), 31 deletions(-) diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 2d3ea8211..746eaec1a 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -43,7 +43,8 @@ {{ Form::open([ 'method' => 'POST', 'route' => ['hardware/bulkedit'], - 'class' => 'form-inline' ]) }} + 'class' => 'form-inline', + 'id' => 'bulkEditForm']) }}
@if (Input::get('status')!='Deleted') @@ -70,7 +71,7 @@ @if (Input::get('status')!='Deleted') -
+ @endif {{ trans('general.id') }} {{ trans('general.company') }} @@ -128,23 +129,32 @@ ]) @stop diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 2b7c84711..6dbde71a0 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -11,7 +11,6 @@ $('.snipe-table').bootstrapTable({ undefinedText: '', iconsPrefix: 'fa', showRefresh: true, - //selectItemName: 'bulk_ids[]', @if (isset($search)) search: true, @endif diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index a85b2050c..8d824e987 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -42,7 +42,8 @@ {{ Form::open([ 'method' => 'POST', 'route' => ['users/bulkedit'], - 'class' => 'form-inline' ]) }} + 'class' => 'form-inline', + 'id' => 'bulkEditForm']) }} @if (Input::get('status')!='deleted') @can('delete', \App\Models\User::class) @@ -69,7 +70,7 @@ @if (Input::get('status')!='deleted') - + @endif {{ trans('general.id') }} {{ trans('admin/companies/table.title') }} @@ -110,8 +111,7 @@ -
-
+ {{ Form::close() }}
@@ -124,13 +124,14 @@ @include ('partials.bootstrap-table', ['exportFile' => 'users-export', 'search' => true])