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

Fix licensing calendar #547

Merged
merged 2 commits into from
Jan 30, 2020

Conversation

veggiematts
Copy link
Contributor

The calendar page in the licensing module is currently broken: it never returns any data.
This patch intends to fix this.

Please note that this is a hotfix. It does return some data now, but I didn't check that said data is what is expected.

Please test this, and report any functional problem.

@veggiematts veggiematts added the bug This is a bug (not an enhancement) label Mar 8, 2019
@poacherone
Copy link
Collaborator

This PR joins the tables correctly, giving results in the table. But the actual dates (how long it has expired) doesn't show, only showing 0. To fix this line 195 in licensing/calendar.php should be changed from “currentEndDate” to “subscriptionEndDate”.

 - Use subscriptionEndDate
@veggiematts
Copy link
Contributor Author

@poacherone can you confirm the fix is ok with your modification ?

@sbouis
Copy link

sbouis commented Jan 30, 2020

I tried this one.
After changing settings in Licensing admin (Authorized Sites; Days After Subscription End; Days Before Subscription End; Resource Types), I can confirm that with this correction I can see in Calendar the Upcoming License Renewals that I coudln't see without.
It lists the resources with a Current Sub End set in an order that is beetween Current Sub End - Days After Subscription End and Current Sub End + Days Before Subscription End.

I only noticed an encoding problem with french accents.

@veggiematts
Copy link
Contributor Author

Thanks for the feedback, @sbouis
I'm merging this, can you create a separate issue for the encoding problem ?

@veggiematts veggiematts merged commit 961a1e2 into coral-erm:development Jan 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This is a bug (not an enhancement) help wanted
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants