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

Move sanitization of input to the model attribute setters. This cleans up a lot of checks in the various controller methods and ensures data will be set in the model accurately regardless of where it's set. Add unit tests for these methods (#3102)

Browse Source
This commit is contained in:
Daniel Meltzer
2016-12-26 18:17:46 -05:00
committed by snipe
parent fd450e2773
commit 06af9311fc
19 changed files with 403 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccessoriesController.php
+6 -33
View File
@@ -85,19 +85,8 @@ class AccessoriesController extends Controller
$accessory->order_number = request('order_number');
$accessory->manufacturer_id = request('manufacturer_id');
$accessory->model_number = request('model_number');
if (request('purchase_date') == ''){
$accessory->purchase_date = null;
} else {
$accessory->purchase_date = request('purchase_date');
}
if (request('purchase_cost') == '0.00'){
$accessory->purchase_cost = null;
} else {
$accessory->purchase_cost = Helper::ParseFloat(request('purchase_cost'));
}
$accessory->purchase_date = request('purchase_date');
$accessory->purchase_cost = Helper::ParseFloat(request('purchase_cost'));
$accessory->qty = request('qty');
$accessory->user_id = Auth::user()->id;
@@ -153,32 +142,16 @@ class AccessoriesController extends Controller
$this->authorize($accessory);
// Update the accessory data
$accessory->name = e(request('name'));
if (e(request('location_id')) == '') {
$accessory->location_id = null;
} else {
$accessory->location_id = request('location_id');
}
$accessory->name = request('name');
$accessory->location_id = request('location_id');
$accessory->min_amt = request('min_amt');
$accessory->category_id = request('category_id');
$accessory->company_id = Company::getIdForCurrentUser(request('company_id'));
$accessory->manufacturer_id = request('manufacturer_id');
$accessory->order_number = request('order_number');
$accessory->model_number = request('model_number');
if (request('purchase_date') == '') {
$accessory->purchase_date = null;
} else {
$accessory->purchase_date = request('purchase_date');
}
if (request('purchase_cost') == '0.00') {
$accessory->purchase_cost = null;
} else {
$accessory->purchase_cost = request('purchase_cost');
}
$accessory->purchase_date = request('purchase_date');
$accessory->purchase_cost = request('purchase_cost');
$accessory->qty = request('qty');
// Was the accessory updated?
app/Http/Controllers/AssetMaintenancesController.php
+12 -68
View File
@@ -9,11 +9,9 @@ use Input;
use Lang;
use Log;
use Mail;
use Redirect;
use Response;
use Slack;
use Str;
use App\Models\Supplier;
use TCPDF;
use Validator;
use View;
@@ -183,31 +181,10 @@ class AssetMaintenancesController extends Controller
{
// create a new model instance
$assetMaintenance = new AssetMaintenance();
if (e(Input::get('supplier_id')) == '') {
$assetMaintenance->supplier_id = null;
} else {
$assetMaintenance->supplier_id = e($request->input('supplier_id'));
}
if (e(Input::get('is_warranty')) == '') {
$assetMaintenance->is_warranty = 0;
} else {
$assetMaintenance->is_warranty = e($request->input('is_warranty'));
}
if (e(Input::get('cost')) == '') {
$assetMaintenance->cost = '';
} else {
$assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost')));
}
if (e(Input::get('notes')) == '') {
$assetMaintenance->notes = null;
} else {
$assetMaintenance->notes = e($request->input('notes'));
}
$assetMaintenance->supplier_id = $request->input('supplier_id');
$assetMaintenance->is_warranty = $request->input('is_warranty');
$assetMaintenance->cost = e($request->input('cost'));
$assetMaintenance->notes = e($request->input('notes'));
$asset = Asset::find(e($request->input('asset_id')));
if (!Company::isCurrentUserHasAccess($asset)) {
@@ -222,14 +199,7 @@ class AssetMaintenancesController extends Controller
$assetMaintenance->completion_date = $request->input('completion_date');
$assetMaintenance->user_id = Auth::id();
if (( $assetMaintenance->completion_date == "" )
|| ( $assetMaintenance->completion_date == "0000-00-00" )
) {
$assetMaintenance->completion_date = null;
}
if (( $assetMaintenance->completion_date !== "" )
&& ( $assetMaintenance->completion_date !== "0000-00-00" )
if (( $assetMaintenance->completion_date !== null )
&& ( $assetMaintenance->start_date !== "" )
&& ( $assetMaintenance->start_date !== "0000-00-00" )
) {
@@ -240,7 +210,6 @@ class AssetMaintenancesController extends Controller
// Was the asset maintenance created?
if ($assetMaintenance->save()) {
// Redirect to the new asset maintenance page
return redirect()->route('maintenances.index')
->with('success', trans('admin/asset_maintenances/message.create.success'));
@@ -248,9 +217,6 @@ class AssetMaintenancesController extends Controller
return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
}
/**
@@ -324,29 +290,10 @@ class AssetMaintenancesController extends Controller
return static::getInsufficientPermissionsRedirect();
}
if (request('supplier_id') == '') {
$assetMaintenance->supplier_id = null;
} else {
$assetMaintenance->supplier_id = e($request->input('supplier_id'));
}
if (request('is_warranty') == '') {
$assetMaintenance->is_warranty = 0;
} else {
$assetMaintenance->is_warranty = e($request->input('is_warranty'));
}
if (request('cost') == '') {
$assetMaintenance->cost = '';
} else {
$assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost')));
}
if (request('notes') == '') {
$assetMaintenance->notes = null;
} else {
$assetMaintenance->notes = e($request->input('notes'));
}
$assetMaintenance->supplier_id = e($request->input('supplier_id'));
$assetMaintenance->is_warranty = e($request->input('is_warranty'));
$assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost')));
$assetMaintenance->notes = e($request->input('notes'));
$asset = Asset::find(request('asset_id'));
@@ -361,10 +308,8 @@ class AssetMaintenancesController extends Controller
$assetMaintenance->start_date = $request->input('start_date');
$assetMaintenance->completion_date = $request->input('completion_date');
if (( $assetMaintenance->completion_date == "" )
|| ( $assetMaintenance->completion_date == "0000-00-00" )
if (( $assetMaintenance->completion_date == null )
) {
$assetMaintenance->completion_date = null;
if (( $assetMaintenance->asset_maintenance_time !== 0 )
|| ( !is_null($assetMaintenance->asset_maintenance_time) )
) {
@@ -372,8 +317,7 @@ class AssetMaintenancesController extends Controller
}
}
if (( $assetMaintenance->completion_date !== "" )
&& ( $assetMaintenance->completion_date !== "0000-00-00" )
if (( $assetMaintenance->completion_date !== null )
&& ( $assetMaintenance->start_date !== "" )
&& ( $assetMaintenance->start_date !== "0000-00-00" )
) {
@@ -387,7 +331,7 @@ class AssetMaintenancesController extends Controller
// Redirect to the new asset maintenance page
return redirect()->route('maintenances.index')
->with('success', trans('admin/asset_maintenances/message.create.success'));
->with('success', trans('admin/asset_maintenances/message.edit.success'));
}
return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
}
app/Http/Controllers/AssetModelsController.php
+4 -24
View File
@@ -75,19 +75,9 @@ class AssetModelsController extends Controller
// Create a new asset model
$model = new AssetModel;
if ($request->input('depreciation_id') == '') {
$model->depreciation_id = 0;
} else {
$model->depreciation_id = $request->input('depreciation_id');
}
if ($request->input('eol') == '') {
$model->eol = 0;
} else {
$model->eol = $request->input('eol');
}
// Save the model data
$model->eol = $request->input('eol');
$model->depreciation_id = $request->input('depreciation_id');
$model->name = $request->input('name');
$model->model_number = $request->input('model_number');
$model->manufacturer_id = $request->input('manufacturer_id');
@@ -199,18 +189,8 @@ class AssetModelsController extends Controller
return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
}
if ($request->input('depreciation_id') == '') {
$model->depreciation_id = 0;
} else {
$model->depreciation_id = $request->input('depreciation_id');
}
if ($request->input('eol') == '') {
$model->eol = null;
} else {
$model->eol = $request->input('eol');
}
$model->depreciation_id = $request->input('depreciation_id');
$model->eol = $request->input('eol');
$model->name = $request->input('name');
$model->model_number = $request->input('model_number');
$model->manufacturer_id = $request->input('manufacturer_id');
app/Http/Controllers/AssetsController.php
+17 -52
View File
@@ -153,23 +153,17 @@ class AssetsController extends Controller
$asset->notes = Input::get('notes');
$asset->asset_tag = Input::get('asset_tag');
$asset->user_id = Auth::id();
$asset->archived = '0';
$asset->physical = '1';
$asset->depreciate = '0';
$asset->status_id = request('status_id',0);
$asset->warranty_months = request('warranty_months', null);
if (Input::get('purchase_cost') == '') {
$asset->purchase_cost = null;
} else {
$asset->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
}
$asset->purchase_date = request('purchase_date', null);
$asset->assigned_to = request('assigned_to', null);
$asset->supplier_id = request('supplier_id', 0);
$asset->requestable = request('requestable', 0);
$asset->rtd_location_id = request('rtd_location_id', null);
$asset->archived = '0';
$asset->physical = '1';
$asset->depreciate = '0';
$asset->status_id = request('status_id',0);
$asset->warranty_months = request('warranty_months', null);
$asset->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
$asset->purchase_date = request('purchase_date', null);
$asset->assigned_to = request('assigned_to', null);
$asset->supplier_id = request('supplier_id', 0);
$asset->requestable = request('requestable', 0);
$asset->rtd_location_id = request('rtd_location_id', null);
// Create the image (if one was chosen.)
if (Input::has('image')) {
@@ -285,44 +279,15 @@ class AssetsController extends Controller
}
$this->authorize($asset);
if ($request->has('status_id')) {
$asset->status_id = $request->input('status_id');
} else {
$asset->status_id = null;
}
if ($request->has('warranty_months')) {
$asset->warranty_months = $request->input('warranty_months');
} else {
$asset->warranty_months = null;
}
if ($request->has('purchase_cost')) {
$asset->purchase_cost = Helper::ParseFloat($request->input('purchase_cost'));
} else {
$asset->purchase_cost = null;
}
if ($request->has('purchase_date')) {
$asset->purchase_date = $request->input('purchase_date');
} else {
$asset->purchase_date = null;
}
if ($request->has('supplier_id')) {
$asset->supplier_id = $request->input('supplier_id');
} else {
$asset->supplier_id = null;
}
$asset->status_id = $request->input('status_id', null);
$asset->warranty_months = $request->input('warranty_months', null);
$asset->purchase_cost = Helper::ParseFloat($request->input('purchase_cost', null));
$asset->purchase_date = $request->input('purchase_date', null);
$asset->supplier_id = $request->input('supplier_id', null);
// If the box isn't checked, it's not in the request at all.
$asset->requestable = $request->has('requestable');
if ($request->has('rtd_location_id')) {
$asset->rtd_location_id = $request->input('rtd_location_id');
} else {
$asset->rtd_location_id = null;
}
$asset->rtd_location_id = $request->input('rtd_location_id', null);
if ($request->has('image_delete')) {
unlink(public_path().'/uploads/assets/'.$asset->image);
app/Http/Controllers/ComponentsController.php
+4 -26
View File
@@ -90,19 +90,8 @@ class ComponentsController extends Controller
$component->order_number = Input::get('order_number');
$component->min_amt = Input::get('min_amt');
$component->serial = Input::get('serial');
if (Input::get('purchase_date') == '') {
$component->purchase_date = null;
} else {
$component->purchase_date = Input::get('purchase_date');
}
if (Input::get('purchase_cost') == '0.00') {
$component->purchase_cost = null;
} else {
$component->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
}
$component->purchase_date = Input::get('purchase_date');
$component->purchase_cost = request('purchase_cost');
$component->qty = Input::get('qty');
$component->user_id = Auth::id();
@@ -169,19 +158,8 @@ class ComponentsController extends Controller
$component->order_number = Input::get('order_number');
$component->min_amt = Input::get('min_amt');
$component->serial = Input::get('serial');
if (Input::get('purchase_date') == '') {
$component->purchase_date = null;
} else {
$component->purchase_date = Input::get('purchase_date');
}
if (Input::get('purchase_cost') == '0.00') {
$component->purchase_cost = null;
} else {
$component->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
}
$component->purchase_date = Input::get('purchase_date');
$component->purchase_cost = request('purchase_cost');
$component->qty = Input::get('qty');
if ($component->save()) {
app/Http/Controllers/ConsumablesController.php
+7 -30
View File
@@ -82,22 +82,11 @@ class ConsumablesController extends Controller
$consumable->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
$consumable->order_number = Input::get('order_number');
$consumable->min_amt = Input::get('min_amt');
$consumable->manufacturer_id = Input::get('manufacturer_id');
$consumable->model_number = Input::get('model_number');
$consumable->item_no = Input::get('item_no');
if (Input::get('purchase_date') == '') {
$consumable->purchase_date = null;
} else {
$consumable->purchase_date = Input::get('purchase_date');
}
if (Input::get('purchase_cost') == '0.00') {
$consumable->purchase_cost = null;
} else {
$consumable->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
}
$consumable->manufacturer_id = Input::get('manufacturer_id');
$consumable->model_number = Input::get('model_number');
$consumable->item_no = Input::get('item_no');
$consumable->purchase_date = Input::get('purchase_date');
$consumable->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
$consumable->qty = Input::get('qty');
$consumable->user_id = Auth::id();
@@ -110,7 +99,6 @@ class ConsumablesController extends Controller
return redirect()->back()->withInput()->withErrors($consumable->getErrors());
}
/**
@@ -166,19 +154,8 @@ class ConsumablesController extends Controller
$consumable->manufacturer_id = Input::get('manufacturer_id');
$consumable->model_number = Input::get('model_number');
$consumable->item_no = Input::get('item_no');
if (Input::get('purchase_date') == '') {
$consumable->purchase_date = null;
} else {
$consumable->purchase_date = Input::get('purchase_date');
}
if (Input::get('purchase_cost') == '0.00') {
$consumable->purchase_cost = null;
} else {
$consumable->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
}
$consumable->purchase_date = Input::get('purchase_date');
$consumable->purchase_cost = Helper::ParseFloat(Input::get('purchase_cost'));
$consumable->qty = Helper::ParseFloat(Input::get('qty'));
if ($consumable->save()) {
app/Http/Controllers/LicensesController.php
+25 -125
View File
@@ -95,72 +95,29 @@ class LicensesController extends Controller
$this->authorize('create', License::class);
// create a new model instance
$license = new License();
if ($request->input('purchase_cost') == '') {
$license->purchase_cost = null;
} else {
$license->purchase_cost = Helper::ParseFloat($request->input('purchase_cost'));
}
if ($request->input('supplier_id') == '') {
$license->supplier_id = null;
} else {
$license->supplier_id = $request->input('supplier_id');
}
if ($request->input('maintained') == '') {
$license->maintained = 0;
} else {
$license->maintained = $request->input('maintained');
}
if ($request->input('reassignable') == '') {
$license->reassignable = 0;
} else {
$license->reassignable = $request->input('reassignable');
}
if ($request->input('purchase_order') == '') {
$license->purchase_order = '';
} else {
$license->purchase_order = $request->input('purchase_order');
}
if (empty($request->input('manufacturer_id'))) {
$license->manufacturer_id = null;
} else {
$license->manufacturer_id = $request->input('manufacturer_id');
}
// Save the license data
$license->name = $request->input('name');
$license->serial = $request->input('serial');
$license->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$license->depreciation_id = $request->input('depreciation_id');
$license->expiration_date = $request->input('expiration_date');
$license->license_email = $request->input('license_email');
$license->license_name = $request->input('license_name');
$license->maintained = $request->input('maintained', 0);
$license->manufacturer_id = $request->input('manufacturer_id');
$license->name = $request->input('name');
$license->notes = $request->input('notes');
$license->order_number = $request->input('order_number');
$license->seats = $request->input('seats');
$license->purchase_cost = $request->input('purchase_cost');
$license->purchase_date = $request->input('purchase_date');
$license->purchase_order = $request->input('purchase_order');
$license->depreciation_id = $request->input('depreciation_id');
$license->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$license->expiration_date = $request->input('expiration_date');
$license->purchase_order = $request->input('purchase_order');
$license->reassignable = $request->input('reassignable', 0);
$license->seats = $request->input('seats');
$license->serial = $request->input('serial');
$license->supplier_id = $request->input('supplier_id');
$license->termination_date = $request->input('termination_date');
$license->user_id = Auth::id();
if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
$license->purchase_date = null;
}
if (($license->expiration_date == "") || ($license->expiration_date == "0000-00-00")) {
$license->expiration_date = null;
}
if (($license->purchase_cost == "") || ($license->purchase_cost == "0.00")) {
$license->purchase_cost = null;
}
// Was the license created?
// Was the license created?
if ($license->save()) {
$license->logCreate();
$insertedId = $license->id;
@@ -198,14 +155,6 @@ class LicensesController extends Controller
$this->authorize('update', $item);
if ($item->purchase_date == "0000-00-00") {
$item->purchase_date = null;
}
if ($item->purchase_cost == "0.00") {
$item->purchase_cost = null;
}
$maintained_list = [
'' => 'Maintained',
'1' => 'Yes',
@@ -243,73 +192,24 @@ class LicensesController extends Controller
$this->authorize('update', $license);
// Update the license data
$license->name = $request->input('name');
$license->serial = $request->input('serial');
$license->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$license->depreciation_id = $request->input('depreciation_id');
$license->expiration_date = $request->input('expiration_date');
$license->license_email = $request->input('license_email');
$license->license_name = $request->input('license_name');
$license->maintained = $request->input('maintained');
$license->maintained = $request->input('maintained', 0);
$license->name = $request->input('name');
$license->notes = $request->input('notes');
$license->order_number = $request->input('order_number');
$license->depreciation_id = $request->input('depreciation_id');
$license->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$license->purchase_cost = $request->input('purchase_cost');
$license->purchase_date = $request->input('purchase_date');
$license->purchase_order = $request->input('purchase_order');
$license->maintained = $request->input('maintained');
$license->purchase_order = $request->input('purchase_order');
$license->reassignable = $request->input('reassignable');
if (empty($request->input('manufacturer_id'))) {
$license->manufacturer_id = null;
} else {
$license->manufacturer_id = $request->input('manufacturer_id');
}
if ($request->input('supplier_id') == '') {
$license->supplier_id = null;
} else {
$license->supplier_id = $request->input('supplier_id');
}
// Update the asset data
if ($request->input('purchase_date') == '') {
$license->purchase_date = null;
} else {
$license->purchase_date = $request->input('purchase_date');
}
if ($request->input('expiration_date') == '') {
$license->expiration_date = null;
} else {
$license->expiration_date = $request->input('expiration_date');
}
if ($request->input('termination_date') == '') {
$license->termination_date = null;
} else {
$license->termination_date = $request->input('termination_date');
}
if ($request->input('purchase_cost') == '') {
$license->purchase_cost = null;
} else {
$license->purchase_cost = Helper::ParseFloat($request->input('purchase_cost'));
}
if ($request->input('maintained') == '') {
$license->maintained = 0;
} else {
$license->maintained = $request->input('maintained');
}
if ($request->input('reassignable') == '') {
$license->reassignable = 0;
} else {
$license->reassignable = $request->input('reassignable');
}
if ($request->input('purchase_order') == '') {
$license->purchase_order = '';
} else {
$license->purchase_order = $request->input('purchase_order');
}
$license->reassignable = $request->input('reassignable', 0);
$license->serial = $request->input('serial');
$license->termination_date = $request->input('termination_date');
//Are we changing the total number of seats?
if ($license->seats != $request->input('seats')) {
app/Http/Controllers/LocationsController.php
+8 -16
View File
@@ -80,11 +80,7 @@ class LocationsController extends Controller
{
$location = new Location();
$location->name = Input::get('name');
if (Input::get('parent_id')=='') {
$location->parent_id = null;
} else {
$location->parent_id = Input::get('parent_id');
}
$location->parent_id = Input::get('parent_id', null);
$location->currency = Input::get('currency', '$');
$location->address = Input::get('address');
$location->address2 = Input::get('address2');
@@ -180,18 +176,14 @@ class LocationsController extends Controller
// Update the location data
$location->name = Input::get('name');
if (Input::get('parent_id')=='') {
$location->parent_id = null;
} else {
$location->parent_id = Input::get('parent_id', '');
}
$location->currency = Input::get('currency', '$');
$location->address = Input::get('address');
$location->address2 = Input::get('address2');
$location->city = Input::get('city');
$location->state = Input::get('state');
$location->parent_id = Input::get('parent_id', null);
$location->currency = Input::get('currency', '$');
$location->address = Input::get('address');
$location->address2 = Input::get('address2');
$location->city = Input::get('city');
$location->state = Input::get('state');
$location->country = Input::get('country');
$location->zip = Input::get('zip');
$location->zip = Input::get('zip');
// Was the asset created?
if ($location->save()) {
app/Http/Controllers/StatuslabelsController.php
+6 -6
View File
@@ -112,13 +112,13 @@ class StatuslabelsController extends Controller
// Save the Statuslabel data
$statusLabel->name = Input::get('name');
$statusLabel->user_id = Auth::id();
$statusLabel->notes = Input::get('notes');
$statusLabel->deployable = $statusType['deployable'];
$statusLabel->pending = $statusType['pending'];
$statusLabel->user_id = Auth::id();
$statusLabel->notes = Input::get('notes');
$statusLabel->deployable = $statusType['deployable'];
$statusLabel->pending = $statusType['pending'];
$statusLabel->archived = $statusType['archived'];
$statusLabel->color = Input::get('color');
$statusLabel->show_in_nav = Input::get('show_in_nav', 0);
$statusLabel->color = Input::get('color');
$statusLabel->show_in_nav = Input::get('show_in_nav', 0);
// Was the asset created?
app/Http/Controllers/UsersController.php
+6 -35
View File
@@ -118,9 +118,9 @@ class UsersController extends Controller
$user->activated = $request->input('activated', $user->activated);
$user->jobtitle = $request->input('jobtitle');
$user->phone = $request->input('phone');
$user->location_id = $request->input('location_id');
$user->company_id = Company::getIdForUser($request->input('company_id'));
$user->manager_id = $request->input('manager_id');
$user->location_id = $request->input('location_id', null);
$user->company_id = Company::getIdForUser($request->input('company_id', null));
$user->manager_id = $request->input('manager_id', null);
$user->notes = $request->input('notes');
// Strip out the superuser permission if the user isn't a superadmin
@@ -129,24 +129,8 @@ class UsersController extends Controller
if (!Auth::user()->isSuperUser()) {
unset($permissions_array['superuser']);
}
$user->permissions = json_encode($permissions_array);
if ($user->manager_id == "") {
$user->manager_id = null;
}
if ($user->location_id == "") {
$user->location_id = null;
}
if ($user->company_id == "") {
$user->company_id = null;
}
if ($user->save()) {
if ($request->has('groups')) {
@@ -339,9 +323,9 @@ class UsersController extends Controller
$user->activated = $request->input('activated', $user->activated);
$user->jobtitle = $request->input('jobtitle');
$user->phone = $request->input('phone');
$user->location_id = $request->input('location_id');
$user->company_id = Company::getIdForUser($request->input('company_id'));
$user->manager_id = $request->input('manager_id');
$user->location_id = $request->input('location_id', null);
$user->company_id = Company::getIdForUser($request->input('company_id', null));
$user->manager_id = $request->input('manager_id', null);
$user->notes = $request->input('notes');
// Strip out the superuser permission if the user isn't a superadmin
@@ -354,18 +338,6 @@ class UsersController extends Controller
$user->permissions = json_encode($permissions_array);
if ($user->manager_id == "") {
$user->manager_id = null;
}
if ($user->location_id == "") {
$user->location_id = null;
}
if ($user->company_id == "") {
$user->company_id = null;
}
// Was the user updated?
if ($user->save()) {
// Prepare the success message
@@ -404,7 +376,6 @@ class UsersController extends Controller
}
if ($user->accessories()->count() > 0) {
// Redirect to the user management page
return redirect()->route('users.index')->with('error', 'This user still has ' . $user->accessories()->count() . ' accessories associated with them.');
}