diff --git a/app/config/version.php b/app/config/version.php index 93c17821d8..b2503ccce8 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-184', - 'hash_version' => 'v1.2.6.1-184-g766afde', + 'app_version' => 'v1.2.6.1-185', + 'hash_version' => 'v1.2.6.1-185-g33e7ce6', ); \ No newline at end of file diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 655f69d77f..fe2e40cf68 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -979,8 +979,12 @@ class AssetsController extends AdminController { return ''.$assets->name.''; }) + ->addColumn('asset_tag',function($assets) + { + return ''.$assets->asset_tag.''; + }) - ->showColumns('asset_tag', 'serial') + ->showColumns('serial') ->addColumn('model',function($assets) {