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.

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

Fixed #15252 - admin ordering on activity report #15264

Merged
merged 8 commits into from
Aug 10, 2024

Conversation

snipe
Copy link
Owner

@snipe snipe commented Aug 10, 2024

This should fix a scoping and sorting issue from #15252 where some details from other companies could be seen in a FMCS context and also fixes the sortability of notes and admins.

Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Copy link

what-the-diff bot commented Aug 10, 2024

PR Summary

  • Enhanced Sorting Functionality
    In the ReportsController, an improvement has been made to the sorting process. Now, you can sort "action logs" by "admin."

  • Streamlined Actonlogs
    The 'Actionlog' model has a new sorting method 'OrderAdmin'. This will allow you to organize the action logs more efficiently based on the admin's first and last names.

  • New Relationship Added
    In the 'Asset' model, a new relationship added with the 'admin' model to boost data interaction and connectivity.

  • Improved UI Interaction
    In 'activity.blade.php' file, the 'note' column has now been made sortable, making data manipulation more user-friendly.

  • Updated Test References
    In the 'StoreAssetTest', the relationship reference was updated from 'adminuser' to 'admin', making it more consistent with the new 'Asset -> admin' relationship.

  • Modified Test Method Names
    In 'BulkEditAssetsTest', the test method name related to editing assets and encrypted custom fields was updated for better clarity.

  • New Test File Introduced
    A new test file 'ActivityReportTest' was added. This will run multiple tests related to activity reports and company scoping, thus ensuring better quality control.

@snipe
Copy link
Owner Author

snipe commented Aug 10, 2024

The tests here are failing but they seem to be failing from the redirect choice stuff, unrelated to this PR.

@snipe snipe merged commit 60eb602 into develop Aug 10, 2024
7 of 9 checks passed
@snipe snipe deleted the fixes/fixed_admin_ordering_on_report branch August 10, 2024 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant