diff --git a/app/config/version.php b/app/config/version.php index 6a981ba2cbad..2b7545b75caa 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-pre', - 'hash_version' => 'v2.0-pre-beta-5-g1c2a409', + 'hash_version' => 'v2.0-pre-beta-30-gdec3f29', ); \ No newline at end of file diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 9a720e801414..94161f82200d 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1015,7 +1015,7 @@ public function postBulkSave($assets = null) public function getDatatable($status = null) { - $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id')); + $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes')); switch ($status) { @@ -1050,7 +1050,7 @@ public function getDatatable($status = null) $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets) { if ($assets->deleted_at=='') { - return '
'; + return ''; } elseif ($assets->model->deleted_at=='') { return ''; } @@ -1134,6 +1134,11 @@ public function getDatatable($status = null) return $assets->eol_date(); }) + ->addColumn('notes',function($assets) + { + return $assets->notes; + }) + ->addColumn('checkout_date',function($assets) { @@ -1144,8 +1149,8 @@ public function getDatatable($status = null) }) ->addColumn($inout) ->addColumn($actions) - ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category') - ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout') + ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category','notes') + ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','notes','checkout_date', 'inout') ->make(); } diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 22a69f4a4b3e..ae202a35805a 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -65,6 +65,7 @@ Lang::get('admin/hardware/table.location'), Lang::get('general.category'), Lang::get('admin/hardware/table.eol'), + Lang::get('general.notes'), Lang::get('admin/hardware/table.checkout_date'), Lang::get('admin/hardware/table.change'), Lang::get('table.actions')) @@ -86,8 +87,8 @@ ), 'sAjaxSource'=> route('api.hardware.list', Input::get('status')), 'dom' =>'CT<"clear">lfrtip', - 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(0,10,11),'activate'=>'mouseover'), - 'columnDefs'=> array(array('visible'=>false,'targets'=>array(7,8,9)),array('orderable'=>false,'targets'=>array(0,10,11))), + 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(0,11,12),'activate'=>'mouseover'), + 'columnDefs'=> array(array('visible'=>false,'targets'=>array(7,8,9)),array('orderable'=>false,'targets'=>array(0,11,12))), 'order'=>array(array(1,'asc')), ) )