Merge branch 'hotfixes/1403' into develop

This commit is contained in:
snipe
2015-11-29 17:20:42 -08:00
+2 -1
View File
@@ -480,9 +480,10 @@ class ModelsController extends AdminController
$assets = $assets->skip($offset)->take($limit)->get();
$rows = array();
$actions = '';
foreach ($assets as $asset) {
$actions = '';
if ($asset->assetstatus) {
if ($asset->assetstatus->deployable != 0) {