From c11510fdcac2b2de09ae9e241c846426bdf0b187 Mon Sep 17 00:00:00 2001 From: Desmond Morris Date: Sun, 1 Dec 2013 20:54:43 -0500 Subject: [PATCH] Removes sorting from actions column. Fixes #56 --- app/views/backend/categories/index.blade.php | 4 ++-- app/views/backend/depreciations/index.blade.php | 4 ++-- app/views/backend/groups/index.blade.php | 2 +- app/views/backend/hardware/index.blade.php | 2 +- app/views/backend/layouts/default.blade.php | 3 ++- app/views/backend/licenses/index.blade.php | 2 +- app/views/backend/locations/index.blade.php | 2 +- app/views/backend/manufacturers/index.blade.php | 2 +- app/views/backend/models/index.blade.php | 2 +- app/views/backend/statuslabels/index.blade.php | 2 +- app/views/backend/users/index.blade.php | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index 06ed0cd66d15..7ff7d61e53cc 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -24,7 +24,7 @@ @lang('admin/categories/table.title') - @lang('table.actions') + @lang('table.actions') @@ -57,4 +57,4 @@ -@stop \ No newline at end of file +@stop diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index 31852708319c..06652810a6cd 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -25,7 +25,7 @@ @lang('admin/depreciations/table.title') @lang('admin/depreciations/table.term') - @lang('table.actions') + @lang('table.actions') @@ -57,4 +57,4 @@ -@stop \ No newline at end of file +@stop diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 555a67fdd5ea..302b9ceb3705 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -26,7 +26,7 @@ @lang('admin/groups/table.name') @lang('admin/groups/table.users') @lang('admin/groups/table.created_at') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index b18733d232cb..19c8117d2d41 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -65,7 +65,7 @@ @endif @lang('admin/hardware/table.change') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 14650c6229b5..0a1d69589bd4 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -294,7 +294,8 @@ $('#example').dataTable({ "sPaginationType": "full_numbers", "iDisplayLength": {{ Setting::getSettings()->per_page }}, - "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]] + "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]], + "aoColumnDefs": [{ 'bSortable': false, 'aTargets': [ 'actions' ] }] }); }); diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php index 2a32b2d35bc0..614f3444004c 100755 --- a/app/views/backend/licenses/index.blade.php +++ b/app/views/backend/licenses/index.blade.php @@ -24,7 +24,7 @@ @lang('admin/licenses/table.title') @lang('admin/licenses/table.serial') @lang('admin/licenses/table.assigned_to') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index abc1acc33b08..f1374096751e 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -26,7 +26,7 @@ @lang('admin/locations/table.city'), @lang('admin/locations/table.state') @lang('admin/locations/table.country') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index 72bf06aebea4..6faff256091a 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -25,7 +25,7 @@ @lang('admin/manufacturers/table.title') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index e4f492518ea1..0a1f28326517 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -25,7 +25,7 @@ @lang('admin/models/table.numassets') Depreciation Category - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php index 0aee7bbd4d41..cad5aab76691 100755 --- a/app/views/backend/statuslabels/index.blade.php +++ b/app/views/backend/statuslabels/index.blade.php @@ -28,7 +28,7 @@ @lang('admin/statuslabels/table.name') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index d50f19705460..a0d1d4f928c8 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -41,7 +41,7 @@ Assets Licenses @lang('admin/users/table.activated') - @lang('table.actions') + @lang('table.actions')