Fixes #688 - show model if no asset name

snipe · Mar 25, 2015 · 35bbea3 · 35bbea3
1 parent 8662382
commit 35bbea3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-123',
-  'hash_version' => 'v1.2.6.1-123-g7f07f35',
+  'app_version' => 'v1.2.6.1-130',
+  'hash_version' => 'v1.2.6.1-130-gad1a939',
 );
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
@@ -437,7 +437,7 @@ public function postCheckout($assetId)
             $data['log_id'] = $logaction->id;
             $data['eula'] = $asset->getEula();
             $data['first_name'] = $user->first_name;
-            $data['item_name'] = $asset->name;
+            $data['item_name'] = $asset->assetNameForEula();
             $data['require_acceptance'] = $asset->requireAcceptance();
 
 

diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -119,6 +119,18 @@ public function assetstatus()
     {
         return $this->belongsTo('Statuslabel','status_id');
     }
+
+	/** 
+	* Get name for EULA 
+	**/
+	public function assetNameForEula()
+    {
+	    if ($this->name=='') {
+		    return $this->model->name;
+	    } else {
+		    return $this->name;
+	    }
+    }
 
 
      public function warrantee_expires()