Skip to content

Fix sorting order of licenses by id with default license at the top#8567

Merged
kcondon merged 5 commits intoIQSS:developfrom
Kris-LIBIS:8554-license-sorting-option2
Apr 8, 2022
Merged

Fix sorting order of licenses by id with default license at the top#8567
kcondon merged 5 commits intoIQSS:developfrom
Kris-LIBIS:8554-license-sorting-option2

Conversation

@Kris-LIBIS
Copy link
Contributor

@Kris-LIBIS Kris-LIBIS commented Apr 1, 2022

What this PR does / why we need it:
This PR fixes the random sorting of licenses in the drop-down when a license record is edited. Using the API to activate a license or setting it as default will also edit the license record.

Which issue(s) this PR closes:

Does not really close #8554, but it solves the most important problems with the issue. When a final and more elaborate solution is agreed upon, the modifications in this PR will need to be revisited anyway.

Special notes for your reviewer:
The PR is not perfect (see the issue discussions), but licenses should remain at the same position with the exception of the default license, which should appear at the top.

Suggestions on how to test this:
Add multiple licenses and check the order of the licenses. Then deactivate and activate licenses, set different default licenses and check the license order in the drop-down.

Does this PR introduce a user interface change? If mockups are available, please link/include them here:
No new UI elements, but influences the order of the content of the license drop-down.

Is there a release notes update needed for this change?:
Not at this point. This fixes the application to behave as expected.

Additional documentation:

@Kris-LIBIS
Copy link
Contributor Author

I noticed that a check failed. I tried the 'Details' link, but the link does not work for me. I get a connection timeout error for jenkins.dataverse.org.

@poikilotherm
Copy link
Contributor

poikilotherm commented Apr 1, 2022

I noticed that a check failed. I tried the 'Details' link, but the link does not work for me. I get a connection timeout error for jenkins.dataverse.org.

No worries @Kris-LIBIS - Jenkins is hidden behind curtains of fail2ban because of bot attacks. The failing test is not related to you, it's been taken care of in #8557. You might want to update this branch with latest develop as the mentioned PR has been merged just yesterday night.

@sekmiller sekmiller assigned sekmiller and unassigned sekmiller Apr 4, 2022
@coveralls
Copy link

Coverage Status

Coverage remained the same at 18.896% when pulling 30f3b27 on Kris-LIBIS:8554-license-sorting-option2 into 3669666 on IQSS:develop.

@kcondon kcondon self-assigned this Apr 7, 2022
@kcondon kcondon merged commit 1688a28 into IQSS:develop Apr 8, 2022
@pdurbin pdurbin added this to the 5.11 milestone Apr 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Multiple license sorting is inconsistent

6 participants