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

Fix PHP notices - Issue 1124 #11

Merged
merged 6 commits into from
May 23, 2019
Merged

Fix PHP notices - Issue 1124 #11

merged 6 commits into from
May 23, 2019

Conversation

seth-shaw-unlv
Copy link
Contributor

@seth-shaw-unlv seth-shaw-unlv commented May 20, 2019

GitHub Issue: Islandora/documentation/issues/1124 and Islandora/documentation/issues/1125

What does this Pull Request do?

Resolves PHP notices about missing settings for the viewer and settings form. Also fixes some minor form errors.

What's new?

  • Changes various form default setting code to see if the setting is set and using blank values if not.
  • Added fit_to_aspect_ratio to openseadragon.settings (set to false, makes explicit that which was implicit)
  • Removed a duplicate settings form item (controlsFadeDelay) and fixes the title for another (maxImageCacheCount)
  • Does this change require documentation to be updated? No
  • Does this change add any new dependencies? No
  • Does this change require any other modifications to be made to the repository
    (ie. Regeneration activity, etc.)? No
  • Could this change impact execution of existing code? No

How should this be tested?

Interested parties

@kayakr, @Islandora-CLAW/committers

@whikloj
Copy link
Member

whikloj commented May 23, 2019

@seth-shaw-unlv what about all the other settings not included in the install config which instead now have these defaults in the form?

Basically everywhere you have added an isset() that variable should be in the config/install/openseadragon.settings.yml

Or I think all of them, at least the first 7 but then I stopped checking

@whikloj
Copy link
Member

whikloj commented May 23, 2019

Then the config is loaded at install time and the isset()s are not required.

@seth-shaw-unlv
Copy link
Contributor Author

@whikloj The ones I added the isset for (e.g. compositeOperation) didn't have entries in openseadragon.settings. True, adding them there would be simpler, but I didn't know what a reasonable default would be, so I opted for checking instead.

Should I just change this PR to give them all blank values in the config?

@whikloj
Copy link
Member

whikloj commented May 23, 2019

@seth-shaw-unlv Can we not add a default of '' in the Yaml?

@seth-shaw-unlv
Copy link
Contributor Author

@whikloj, probably. I'll try it once I'm done testing a different PR.

@seth-shaw-unlv
Copy link
Contributor Author

I've added default settings to config and reverted the issets. How's it look @whikloj?

Copy link
Member

@whikloj whikloj left a comment

Choose a reason for hiding this comment

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

Looks good and works as advertised.

@whikloj whikloj merged commit 03610ed into Islandora:8.x-1.x May 23, 2019
@seth-shaw-unlv seth-shaw-unlv deleted the issue-1124 branch May 23, 2019 21:08
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.

2 participants