From a22687abc5cc913d5f83ecbac4046ba05353d30e Mon Sep 17 00:00:00 2001 From: madd15 Date: Tue, 7 Jul 2015 14:38:28 +0930 Subject: [PATCH] Fix #896 - Only show Checkout/Checkin if deployable --- app/controllers/admin/AssetsController.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index ea794a9665..b015d6c37f 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1039,15 +1039,16 @@ class AssetsController extends AdminController }); - $inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets) - { - if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) { - return ''.Lang::get('general.checkin').''; - } else { - return ''.Lang::get('general.checkout').''; - } - }); - + $inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets) + { + if ($assets->assetstatus->deployable != 0) { + if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) { + return ''.Lang::get('general.checkin').''; + } else { + return ''.Lang::get('general.checkout').''; + } + } + }); return Datatable::collection($assets)