diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 9d58ffe39c..e80cb34a3b 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -401,7 +401,13 @@ class ModelsController extends AdminController public function getDatatable($status = null) { $models = Model::with('category','assets','depreciation'); - ($status != 'Deleted') ?: $models->withTrashed()->Deleted(); + + switch ($status) { + case 'Deleted': + $models->withTrashed()->Deleted(); + break; + } + if (Input::has('search')) { $models = $models->TextSearch(Input::get('search')); diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index e8fffe3777..cdda954754 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -53,7 +53,7 @@ {{ Form::open([ 'method' => 'POST', 'route' => ['hardware/bulkedit'], - 'class' => 'form-horizontal' ]) }} + 'class' => 'form-horizontal' ]) }} {{--