From 4fcf70872f89f3d11b3779546b2398afbdfea592 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 13 Aug 2015 13:24:38 -0700
Subject: [PATCH] Fixes #1054

---
 app/config/version.php                     | 2 +-
 app/controllers/admin/AssetsController.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/config/version.php b/app/config/version.php
index 9a87664f66..0c9f40f76f 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -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',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index ecb3679bcf..b4767ffba4 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -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);
     }