-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* update the solr_params[:fq] value in #with_deactivated_embargos to match whats in the dassie app. ref: #5844 * properly set "embargo.embargo_history" when deactivating an embargo on koppie * save the embargo on the work after its been updated, when deactivating the embargo. remove an errant pry * wip: able to display past embargoes on the edit embargo page, and under the deactivated embargoes tab. the edit page now does not reflect that the embargo is gone though. co-authored-by: braydon <braydon.justice@1268456bcltd.ca> * verify that there is an embargo release date in #enforced? before saying there is an embargo. before this commit if a user simply changed the visibility of a work to "restricted", then the app would think there was an embargo on the work since the embargo visibility was also "restricted". co-authored-by: braydon <braydon.justice@1268456bcltd.ca> * index the "embargo_history_ssim" value in solr when an embargo has been deactivated so that it shows up on the "deactivated embargoes" tab of embargoes/index. co-authored-by: braydon <braydon.justice@1268456bcltd.ca> * stop persisting the work in EmbargoActor#destroy because the AccessControlList persists it for us. something is still going on weird though. it appears that the embargo object in the database is different than the embargo metadata thats getting saved on the work. this means that the "past embargoes" section on the embargo/edit page shows different data than the data in the "deactivated embargoes" tab on the embargo/index page. co-authored-by: braydon <braydon.justice@1268456bcltd.ca> * save the embargo id to the work as a reference instead of the embargo itself. this change fixes the problem where the updated embargo is different than the embargo that got saved on the work. co-authored-by: braydon <braydon.justice@1268456bcltd.ca> * lease structure now matches embargo structure * save the embargo and lease before setting it, so we have access to the id * embargoes and leases are no longer saved to the work itself. instead, we need to find them by their id * rubocop fixes * embargoes and leases now save during changeset sync along with the resource. embargo_manager lazy loads embargo. * update leases to work like embargoes. use the safe navigation operator when calling methods in the valkyrie_work_indexer * fix some specs. co-authored-by: braydon <braydon.justice@1268456bcltd.ca> * fix lease spec issues * embargo actor spec fixes * decouple the deactivated lease work from the deactivated embargo work. that work can now be found on #6111. * fix one more embargo manager spec * move a few more lease related changes to #6111 * Update app/services/hyrax/embargo_manager.rb Co-authored-by: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com> * Update app/models/hyrax/resource.rb Co-authored-by: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com> --------- Co-authored-by: braydon <braydon.justice@1268456bcltd.ca> Co-authored-by: Rob Kaufman <rob@notch8.com> Co-authored-by: braydonjustice <braydonjustice@gmail.com> Co-authored-by: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com>
- Loading branch information
1 parent
d0bd18b
commit f271ebd
Showing
12 changed files
with
68 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters