ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
snipe
2013-11-26 11:57:39 -05:00
parent 1ff93f65b3 dc5ad87686
commit c8288b430e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/LicensesController.php
+3 -3
View File
@@ -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'));
}
/**
app/lang/en/admin/licenses/message.php
+6 -1
View File
@@ -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'
),
);