Fixes #222

app/controllers/admin/LicensesController.php

@@ -26,8 +26,8 @@ class LicensesController extends AdminController
      *
      * @return View
      */
-    
-     
+
+
 
 
     public function getIndex()
@@ -336,8 +336,9 @@ public function getCheckout($seatId)
 			->whereNull('assets.deleted_at')
 			->get();
 
-			$asset_array = json_decode(json_encode($asset), true);   
-
+			$asset_array = json_decode(json_encode($asset), true);
+			$asset_element[''] = 'Please select an asset';
+
 			// Build a list out of the data results
 			for ($x=0; $x<count($asset_array); $x++) {
 
@@ -346,12 +347,9 @@ public function getCheckout($seatId)
 				} else {
 					$full_name = ' (Unassigned)';
 				}
-				$asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;
-
-
+				$asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name.' - '.$asset_array[$x]['id'];
+
 			}
-                        //add label
-                         array_splice($asset_element, 0, 0, "Please select an Asset");
 
         return View::make('backend/licenses/checkout', compact('licenseseat'))->with('users_list',$users_list)->with('asset_list',$asset_element);
 
@@ -364,7 +362,7 @@ public function getCheckout($seatId)
     **/
     public function postCheckout($seatId)
     {
-        
+
 
         $assigned_to = e(Input::get('assigned_to'));
         $asset_id = e(Input::get('asset_id'));
@@ -373,7 +371,8 @@ public function postCheckout($seatId)
         $rules = array(
 
             'note'   => 'alpha_space',
-            'asset_id'	=> 'required_without:assigned_to:min:1',
+//            'asset_id'	=> 'required_without:assigned_to:min:1',
+            'asset_id'	=> 'required',
         );
 
         // Create a new validator instance from our validation rules
@@ -541,26 +540,26 @@ public function getView($licenseId = null)
             return Redirect::route('licenses')->with('error', $error);
         }
     }
-    
+
     public function getClone($licenseId = null)
     {
          // Check if the license exists
         if (is_null($license_to_clone = License::find($licenseId))) {
             // Redirect to the blogs management page
             return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.does_not_exist'));
         }
-        
+
           // Show the page
         $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
 
         //clone the orig
         $license = clone $license_to_clone;
-        $license->id = null; 
-        $license->serial = null;        
-        
+        $license->id = null;
+        $license->serial = null;
+
         // Show the page
         $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
         return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('license',$license);
-    
+
     }
 }