8796 fix no license display and indexing #10614
Conversation
|
I thought from #8796 (comment) that this was going to be handled via non-active custom license for no terms and then removing the boilerplate text in termsofuse and adding that license at Harvard? |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
| //test to see if the terms of use are the default set in 5.10 - if so and there's no license then don't add license to solr doc. | ||
| //fixes 10513 | ||
| if (datasetVersionService.isVersionDefaultCustomTerms(datasetVersion)){ | ||
| return; |
There was a problem hiding this comment.
This doesn't yet fully solve the problem for which #10513 was opened, for some harvested files - where the license id is null, AND so is the termsofuse - we don't want to index such as "Custom Terms" either.
But a quick null check below should fix that... let me try.
There was a problem hiding this comment.
@sekmiller @qqmyers
I have added this extra check for null TermsOfUse: 194b099
in order to fix #10513 for harvested datasets that have neither a standard license, nor anything populated in TermsOfUseAndAccess.
Is this ok? - i.e., ok to assume that a version with actual custom terms of use will always have a non-null TermsOfUse?
There was a problem hiding this comment.
... I'm leaning towards merging it shortly, unless someone stops me.
…ts harvested in oai_dc, and not break anything else... I think? #8796
|
📦 Pushed preview images as 🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name. |
What this PR does / why we need it:
Modifies the display so that datasets which were updated in version 5.10 to have "Terms of Use" that actually indicate that no terms of use have been entered are not displayed with "Custom Terms" in the UI. Also, it updates the index service bean so that these datasets are not indexed as having Custom Terms
Which issue(s) this PR closes:
Closes #8796 Indicate on dataset page when dataset version has no license or custom
Closes #10513 stop indexing datasets with no terms as "Custom Terms"
Special notes for your reviewer:
Suggestions on how to test this: I had to manually update the terms of use for some datasets to be :"This dataset is made available without information on how it can be used. You should communicate with the Contact(s) specified before use." Verify that these datasets are not indexed as having custom terms and not displayed as such in the UI.
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
Is there a release notes update needed for this change?:
Additional documentation: