Islandora tokens 1171 pt2 #845
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
wgilling
force-pushed
the
islandora_tokens_1171_pt2
branch
from
0038032 to
d9af78f
Compare
dannylamb
requested changes
Jul 26, 2021
islandora.tokens.inc
Outdated
| if (!is_null($fid_value)) { | ||
| $file = File::load($fid_value); | ||
| if ($file) { | ||
| $url = $file->getFileUri(); |
There was a problem hiding this comment.
This returns files with a protocol of public:// or fedora://, which can't be de-referenced from the outside. There's a function is IslanodraUtils you can use to get the download url of the file.
$url = $islandora_utils->getDownloadUrl($file); should do the trick.
There was a problem hiding this comment.
Confirmed, it definitely does the trick. Make that change and this goes in 🚀 🙇♂️
There was a problem hiding this comment.
getDownloadUrl replaced the previous code
dannylamb
approved these changes
Jul 27, 2021
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.
GitHub Issue: (Islandora/documentation#1171)
Release pull requests, etc.)
What does this Pull Request do?
This should complete the redistribution of all the tokens that were previously in the two distinct "islandora_tokens" modules (by @kayakr and @wgilling). Since this branch was once merged to islandora already, this new PR is to address the last change to islandora module to provide the
pdf_urltoken. After this is merged, the full set of tokens would be available as part of islandora or the controlled_access_terms module (separate code repo and PR for that).This PR moves all tokens that needed Media or File functionality into the islandora module.
What's new?
There should be no side-effects. If the instance of controlled_access_terms is not up to date, this PR may cause a conflict as to which module provides the functionality for this
pdf_urltoken.pdf_urltoken to islandora/islandora.tokens.incpdf_urltoken has already been removed from the controlled_access_terms/controlled_access_terms.tokens.inc(i.e. Regeneration activity, etc.)? clear the cache after pulling down the code
How should this be tested?
pdf_urltokenA description of what steps someone could take to:
Interested parties
@dannylamb, @Islandora/8-x-committers