Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set location_id to rtd_location_id on asset creation #8239

Merged
merged 2 commits into from
Jul 17, 2020
Merged

Set location_id to rtd_location_id on asset creation #8239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7125c3
Set location_id to rtd_location_id on asset creation
snipe Jul 16, 2020
897757b
Removed added line for location
snipe Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/Http/Controllers/Api/AssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ public function store(AssetRequest $request)
$asset->supplier_id = $request->get('supplier_id', 0);
$asset->requestable = $request->get('requestable', 0);
$asset->rtd_location_id = $request->get('rtd_location_id', null);
$asset->location_id = $request->get('rtd_location_id', null);

// Update custom fields in the database.
// Validation for these fields is handled through the AssetRequest form request
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/AssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public function store(AssetRequest $request)
$asset->supplier_id = request('supplier_id', 0);
$asset->requestable = request('requestable', 0);
$asset->rtd_location_id = request('rtd_location_id', null);
$asset->location_id = request('rtd_location_id', null);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird; this change doesn't seem necessary - below, you have:

if ($asset->assigned_to=='') {
   //etc

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. You're right...

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this is only necessary in the API controller.


if ($asset->assigned_to=='') {
$asset->location_id = $request->input('rtd_location_id', null);
Expand Down