ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1054

Browse Source
This commit is contained in:
snipe
2015-08-13 13:24:38 -07:00
parent ac7b5da711
commit 4fcf70872f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0-pre',
'hash_version' => 'v2.0-pre-beta-339-g58abd15',
'hash_version' => 'v2.0-pre-beta-342-gc5e5930',
);
app/controllers/admin/AssetsController.php
+2
View File
@@ -214,6 +214,7 @@ class AssetsController extends AdminController
$category_list = categoryList();
$supplier_list = suppliersList();
$assigned_to = assignedToList();
$statuslabel_types = statusTypeList();
return View::make('backend/hardware/edit', compact('asset'))
->with('model_list',$model_list)
@@ -222,6 +223,7 @@ class AssetsController extends AdminController
->with('statuslabel_list',$statuslabel_list)
->with('assigned_to',$assigned_to)
->with('manufacturer',$manufacturer_list)
->with('statuslabel_types',$statuslabel_types)
->with('category',$category_list);
}