Possible fix for #518 - license count issue

snipe · Feb 12, 2015 · f57c61d · f57c61d
1 parent 58ff929
commit f57c61d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
@@ -369,8 +369,8 @@ public function getDelete($licenseId)
 
             // Delete the license and the associated license seats
             DB::table('license_seats')
-            ->where('id', $asset->id)
-            ->update(array('assigned_to' => NULL));
+            ->where('id', $license->id)
+            ->update(array('assigned_to' => NULL,'asset_id' => NULL));
 
             $licenseseats = $license->licenseseats();
             $licenseseats->delete();
@@ -578,7 +578,7 @@ public function postCheckin($seatId)
         $logaction->checkedout_to = $licenseseat->assigned_to;
 
         // Update the asset data
-        $licenseseat->assigned_to                   = '0';
+        $licenseseat->assigned_to                   = NULL;
         $licenseseat->asset_id                      = NULL;
 
         // Was the asset updated?

diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -201,6 +201,12 @@ public function eol_date()
      public static function autoincrement_asset()
     {
         $settings = Setting::getSettings();
+
+        if (isset($asset_tag->id)) {
+        	$asset_id = $asset_tag->id;
+        } else {
+        	$asset_id = 1;
+        }
 		if ($settings->auto_increment_assets == '1') {
 			$asset_tag = DB::table('assets')
                     ->where('physical', '=', '1')