diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index e27e628dd2..46315913e3 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -740,6 +740,10 @@ class UsersController extends AdminController return Datatable::collection($users) + ->addColumn('',function($users) + { + return ''; + }) ->addColumn('name',function($users) { return ''.$users->fullName().''; diff --git a/app/routes.php b/app/routes.php index ad3ea104e4..1cb043fe21 100755 --- a/app/routes.php +++ b/app/routes.php @@ -316,6 +316,15 @@ Route::group(array('prefix' => 'admin', 'before' => 'admin-auth', 'namespace' => Route::get('{userId}/restore', array('as' => 'restore/user', 'uses' => 'UsersController@getRestore')); Route::get('{userId}/view', array('as' => 'view/user', 'uses' => 'UsersController@getView')); Route::get('{userId}/unsuspend', array('as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend')); + + Route::post('bulkedit', + array('as' => 'users/bulkedit', + 'uses' => 'UsersController@postBulkEdit')); + Route::post('bulksave', + array('as' => 'users/bulksave', + 'uses' => 'UsersController@postBulkSave')); + + Route::get('/', array('as' => 'users', 'uses' => 'UsersController@getIndex')); }); diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 4be4f6a11c..382a4a0454 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -1,7 +1,7 @@ @extends('backend/layouts/default') @section('title0') - + @if (Input::get('status')) @if (Input::get('status')=='Pending') @lang('general.pending') @@ -57,16 +57,16 @@ {{ Datatable::table() - ->addColumn('',Lang::get('admin/hardware/form.name'), - Lang::get('admin/hardware/table.asset_tag'), + ->addColumn('',Lang::get('admin/hardware/form.name'), + Lang::get('admin/hardware/table.asset_tag'), Lang::get('admin/hardware/table.serial'), Lang::get('admin/hardware/form.model'), Lang::get('admin/hardware/table.status'), Lang::get('admin/hardware/table.location'), Lang::get('general.category'), Lang::get('admin/hardware/table.eol'), - Lang::get('admin/hardware/table.checkout_date'), - Lang::get('admin/hardware/table.change'), + Lang::get('admin/hardware/table.checkout_date'), + Lang::get('admin/hardware/table.change'), Lang::get('table.actions')) ->setOptions( array( @@ -75,7 +75,7 @@ 'lengthMenu' => Lang::get('general.page_menu'), 'loadingRecords' => Lang::get('general.loading'), 'zeroRecords' => Lang::get('general.no_results'), - 'info' => Lang::get('general.pagination_info'), + 'info' => Lang::get('general.pagination_info'), 'processing' => Lang::get('general.processing'), 'paginate'=> array( 'first'=>Lang::get('general.first'), @@ -112,17 +112,17 @@ $('#bulkEdit').attr('disabled', 'disabled'); } } - + $('table').on('change','input.one_required',checkForChecked); - + $("#checkAll").change(function () { $("input:checkbox").prop('checked', $(this).prop("checked")); checkForChecked(); }); }); - - + + diff --git a/app/views/backend/users/datatable.blade.php b/app/views/backend/users/datatable.blade.php new file mode 100644 index 0000000000..a5c6f1b6fd --- /dev/null +++ b/app/views/backend/users/datatable.blade.php @@ -0,0 +1,37 @@ +
| {{ $c }} | + @endforeach +|||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| + + | +|||||||||||
| {{ $dd }} | + @endforeach +|||||||||||