Fixes #10015. Archived Assets Showing Under Locations/'Print All Assigned' Feature #10079
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… it skips the assets in relation of if they're archived and that option is marked in the settings
snipe
reviewed
Sep 13, 2021
| @@ -126,7 +126,11 @@ | |||
| @endphp | |||
|
|
|||
| @foreach ($assets as $asset) | |||
|
|
|||
| @php | |||
| if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->name === 'Archived'){ | |||
There was a problem hiding this comment.
We can't always assume the name will be "Archived" though. We'd want to look at the status label type here, I think.
There was a problem hiding this comment.
I used $asset->assetstatus->archived instead, I think that is better. Thanks for the input.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When viewing a Location we can print all assets assigned to that location, but the report to print shows the Archived ones even if the option to do that is not activated. This is not my finest solution performance-wise but let me know what you think.
I added a condition for when the asset is marked as 'Archived' and the option in settings is not activated, in the report I just skip that asset and continue the loop that prints' em, as I was unable to filter' em from the query, 🤷♂️
Fixes #10015
Type of change
How Has This Been Tested?
Test Configuration:
Checklist: