Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mirador patch #35

Merged
merged 4 commits into from
Sep 9, 2020
Merged

Mirador patch #35

merged 4 commits into from
Sep 9, 2020

Conversation

elizoller
Copy link
Member

GitHub Issue: (Islandora/documentation#1608)

What does this Pull Request do?

Moves the "Mirador" display hint to the islandora_mirador submodule

What's new?

  • removes "Mirador" term from the migrate in the main part of islandora_defaults
  • adds an install and an update hook to add the term if it doesn't exist

How should this be tested?

  • install a regular islandora-playbook
  • be sure you have no vestiges of islandora_mirador (including the term in the Islandora Display vocabulary)
  • install islandora_mirador submodule
  • check that you now have a term "Mirador"

Interested parties

@Islandora/8-x-committers
@mjordan
@kayakr
@seth-shaw-unlv

Copy link
Contributor

@mjordan mjordan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as intended. The term "Mirador" is created and the Contexts using it are created as well.

@mjordan
Copy link
Contributor

mjordan commented Sep 9, 2020

@elizoller Not directly related to this issue, but I notice that https://github.com/Islandora/islandora_defaults/blob/8.x-1.x/modules/islandora_mirador/config/install/context.context.mirador.yml#L18 contains a hard-coded term ID. This should be removed.

In your branch, I just uninstalled the Mirador module and deleted the "Mirador" term and Contexts, then deleted https://github.com/Islandora/islandora_defaults/blob/8.x-1.x/modules/islandora_mirador/config/install/context.context.mirador.yml#L16-L18 and re-enabled the Islandora Mirador module and the context was created as expected.

The paged content Context doesn't specify this term ID.

@elizoller
Copy link
Member Author

Ok, i'll swap that for the URI

@seth-shaw-unlv
Copy link
Contributor

Travis is failing on coding style in the Mirador block.

@seth-shaw-unlv
Copy link
Contributor

Oddly, that block it is failing on isn't part of the PR, but we didn't catch it the first time.

@elizoller
Copy link
Member Author

for whatever reason when i run phpcs on my local, it doesn't catch this error and i'm using the same packages. maybe i'm running a different version of phpcs or something.
regardless - i'll have a new commit up here soon

@mjordan
Copy link
Contributor

mjordan commented Sep 9, 2020

Very good, I'll retest and merge if all goes well.

@mjordan
Copy link
Contributor

mjordan commented Sep 9, 2020

Retested after updates, all is 👍.

@mjordan mjordan merged commit 998afd5 into Islandora:8.x-1.x Sep 9, 2020
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.

3 participants