Merge remote-tracking branch 'origin/bugs/160' into develop

snipe · snipe · commit e7e75631c5a0 · 2014-06-19T22:15:44.000-04:00
diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php
@@ -223,7 +223,6 @@ public function postEdit($licenseId = null)
 					{
 						for ($i=1; $i <= abs($difference); $i++) {
 							//Delete the appropriate number of seats
-							//$seats->first()->delete();
 							$license->licenseseats->pop()->delete();
 							echo '<li>'.$i;
 						}

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,6 @@ public function postEdit($licenseId = null)`
`223`	`223`	`{`
`224`	`224`	`for ($i=1; $i <= abs($difference); $i++) {`
`225`	`225`	`//Delete the appropriate number of seats`
`226`		`- //$seats->first()->delete();`
`227`	`226`	`$license->licenseseats->pop()->delete();`
`228`	`227`	`echo '<li>'.$i;`
`229`	`228`	`}`