From dc5ad876863a1e17babce06adfb365f38c30ca59 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 26 Nov 2013 11:57:14 -0500 Subject: [PATCH] Fixes #59 --- app/controllers/admin/LicensesController.php | 6 +++--- app/lang/en/admin/licenses/message.php | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php index 7cd9dbf8f9..b022ba3be7 100644 --- a/app/controllers/admin/LicensesController.php +++ b/app/controllers/admin/LicensesController.php @@ -312,7 +312,7 @@ class LicensesController extends AdminController { if (is_null($licenseseat = LicenseSeat::find($seatId))) { // Redirect to the asset management page with error - return Redirect::to('admin/licenses')->with('error', Lang::get('admin/assets/message.not_found')); + return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found')); } $logaction = new Actionlog(); @@ -331,11 +331,11 @@ class LicensesController extends AdminController { $log = $logaction->logaction('checkin from'); // Redirect to the new asset page - return Redirect::to("admin/licenses")->with('success', Lang::get('admin/licenses/message.checkout.success')); + return Redirect::to("admin/licenses")->with('success', Lang::get('admin/licenses/message.checkin.success')); } // Redirect to the asset management page with error - return Redirect::to("admin/licenses")->with('error', Lang::get('admin/licenses/message.checkout.error')); + return Redirect::to("admin/licenses")->with('error', Lang::get('admin/licenses/message.checkin.error')); } /** diff --git a/app/lang/en/admin/licenses/message.php b/app/lang/en/admin/licenses/message.php index 943ede9494..3d480141cb 100755 --- a/app/lang/en/admin/licenses/message.php +++ b/app/lang/en/admin/licenses/message.php @@ -25,6 +25,11 @@ return array( 'checkout' => array( 'error' => 'There was an issue checking out the license. Please try again.', 'success' => 'The license was checked out successfully' - ) + ), + + 'checkin' => array( + 'error' => 'There was an issue checking in the license. Please try again.', + 'success' => 'The license was checked in successfully' + ), );