Skip to content

Commit 4fcf708

Browse files
committed
Fixes #1054
1 parent ac7b5da commit 4fcf708

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

app/config/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
return array (
33
'app_version' => 'v2.0-pre',
4-
'hash_version' => 'v2.0-pre-beta-339-g58abd15',
4+
'hash_version' => 'v2.0-pre-beta-342-gc5e5930',
55
);

app/controllers/admin/AssetsController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ public function getEdit($assetId = null)
214214
$category_list = categoryList();
215215
$supplier_list = suppliersList();
216216
$assigned_to = assignedToList();
217+
$statuslabel_types = statusTypeList();
217218

218219
return View::make('backend/hardware/edit', compact('asset'))
219220
->with('model_list',$model_list)
@@ -222,6 +223,7 @@ public function getEdit($assetId = null)
222223
->with('statuslabel_list',$statuslabel_list)
223224
->with('assigned_to',$assigned_to)
224225
->with('manufacturer',$manufacturer_list)
226+
->with('statuslabel_types',$statuslabel_types)
225227
->with('category',$category_list);
226228
}
227229

0 commit comments

Comments
 (0)