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

Merge conflict resolution. Added a use at the same line as remote. Fixed

Browse Source
This commit is contained in:
Splaer
2015-02-25 14:09:58 -05:00
parent 6d4f4c6064 2b83b52735
commit b2af455523
56 changed files with 729 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+24 -5
View File
@@ -22,6 +22,7 @@ use Config;
use Location;
use Log;
use DNS2D;
use Mail;
class AssetsController extends AdminController
{
@@ -238,7 +239,10 @@ class AssetsController extends AdminController
// Grab the dropdown list of models
$model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
$model_list = array('' => '') + DB::table('models')
->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
->orderBy('modelno', 'asc')
->lists('name', 'id');
$supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
$location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
@@ -428,7 +432,7 @@ class AssetsController extends AdminController
// Check if the user exists
if (is_null($assigned_to = User::find($assigned_to))) {
if (is_null($user = User::find($assigned_to))) {
// Redirect to the asset management page with error
return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.user_does_not_exist'));
}
@@ -442,10 +446,23 @@ class AssetsController extends AdminController
$logaction->asset_id = $asset->id;
$logaction->checkedout_to = $asset->assigned_to;
$logaction->asset_type = 'hardware';
$logaction->location_id = $assigned_to->location_id;
$logaction->location_id = $user->location_id;
$logaction->user_id = Sentry::getUser()->id;
$logaction->note = e(Input::get('note'));
$log = $logaction->logaction('checkout');
$data['asset_id'] = $asset->id;
$data['eula'] = $asset->getEula();
$data['first_name'] = $user->first_name;
if ($asset->requireAcceptance()=='1') {
Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->subject('Confirm asset delivery');
});
}
// Redirect to the new asset page
return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.checkout.success'));
@@ -860,6 +877,8 @@ class AssetsController extends AdminController
return Redirect::to("hardware");
}
}