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

Jump to bottom

Fixed issue where View Assigned Assets would crash if there are no custom fields for any assigned models #12132

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Fixed issue where View Assigned Assets would crash if there are no custom fields for any assigned models #12132

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1122562
Handle use case where there are no custom fields for any assigned models
snipe Nov 16, 2022
489895a
Added comments and spacing for readability
snipe Nov 16, 2022
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
13 changes: 9 additions & 4 deletions app/Http/Controllers/ViewAssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,19 @@ public function getIndex()
'licenses',
)->find(Auth::user()->id);

$field_array = array();

// Loop through all the custom fields that are applied to any model the user has assigned
foreach ($user->assets as $asset) {
foreach ($asset->model->fieldset->fields as $field) {
// check and make sure they're allowed to see the value of the custom field
if ($field->display_in_user_view == '1') {
$field_array[$field->db_column] = $field->name;
if ($asset->model->fieldset) {
foreach ($asset->model->fieldset->fields as $field) {
// check and make sure they're allowed to see the value of the custom field
if ($field->display_in_user_view == '1') {
$field_array[$field->db_column] = $field->name;
}
}
}

}

// Since some models may re-use the same fieldsets/fields, let's make the array unique so we don't repeat columns
Expand Down