-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
Added Ldap Company as option and FMCS Notification #14650
base: develop
Are you sure you want to change the base?
Conversation
PR Summary
|
What happens if the user already had things checked out to them that belong to a certain company, and then the user's company changes with FMCS turned on? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few questions we need to think through, I think?
Can you handle these merge conflicts when you get a moment? |
conflicts handled 👍 |
Hm, some tests are failing that are related to the accessories stuff - I think maybe the develop merge bonked something? |
@Godmartinz awesome, thanks - can we get those tests passing? |
So a new Accessory_Checkout model had been introduced, I fixed the the relationships and the method calls for accessories. Still have to fix up the asset relations it seems. working on it 👍 |
Interesting that tests pass on sqlite. |
# Conflicts: # app/Console/Commands/LdapSync.php # resources/views/layouts/default.blade.php
Description
This adds
ldap_company
to the settings table as a syncable option for LDAP.This also adds an addition to the notification system, if FMCS is turned on it will notify you in the Navbar with info on the Asset/License/Accessory in question.
Notifications are links to the item/s in question.
https://github.com/snipe/snipe-it/assets/47435081/5d10fcba-6f87-4d58-bd62-5ee56d667e49
The notification logic does not fire unless FMCS is turned on.
https://github.com/snipe/snipe-it/assets/47435081/bb5a227a-55ea-48f0-aae2-553830815800
Fixes # [sc-25411]
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: