diff --git a/app/config/version.php b/app/config/version.php index 48d8495a08..e79fceb5b2 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-24', - 'hash_version' => 'v1.2.6.1-24-ge23c0cb', + 'app_version' => 'v1.2.6.1-33', + 'hash_version' => 'v1.2.6.1-33-g2a0350b', ); \ No newline at end of file diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 7730545ed9..0c367fb1d1 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -911,6 +911,7 @@ class AssetsController extends AdminController $assets = $assets->orderBy('asset_tag', 'ASC')->get(); + $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets) { if ($assets->deleted_at=='') { @@ -931,7 +932,15 @@ class AssetsController extends AdminController } }); + + return Datatable::collection($assets) + ->addColumn('',function($assets) + { + + return ''; + + }) ->addColumn('name',function($assets) { return link_to('hardware/'.$assets->id.'/view', $assets->name); diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index fd9c8a7175..86d2164469 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -45,7 +45,7 @@ -