Merge main into Zip files development #1845
Merged
Conversation
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
* BXC-4734 update for thumbnail placeholder usage * BXC-4734 remove placeholder test from download image IT * BXC-4734 change null to empty array * BXC-4734 clean up code * BXC-4734 update file extension
* BXC-4761 set force to true to force access copy regeneration * BXC-4761 set to string true
* BXC-4760 excuse admin unit from permissions check * BXC-4760 move method
Display filesize on file objects
* Move image download access into the files table * Update tests and fix issues found by tests * Fix issue with empty download column showing up, if there is no downloadable content * Add translations back in and check dropdown urls, instead of text, as translations aren't in scope in the tests. * Don't show modal if user is logged in * Check for restricted content, not downloadable images, and pass the file's info into the restriction check instead of using the work's info. * Fix display issue and modal tests * Use login modal on file pages * Don't show modal login if logging in doesn't grant further access. * Fix layout of buttons on small screens and add "view" item back in for file records * Display login button for folders and collections * Fix button layout * Fix button layout in the files table * Fix issue with no valid download sizes, but user canViewOriginal * Set default as logged in * Check if JP2 exists and rename restrictedContent component
bbpennel
force-pushed
the
zip-files-development-merge
branch
from
fcb1030 to
978ded0
Compare
…ays the case for containers. Fix nesting of briefObject within response objects in tests, since sometimes it was nested, double nested, or not nested. restrictedFiles now uses restrictedContent to DRY it up, and restrictedContent can now also deal with data being nested or not
bbpennel
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges main into zip files development and resolves merge conflicts