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

[InstrumentStatus_ControlPanel] Restore $validity to $Validity #6119

Merged

Conversation

zaliqarosli
Copy link
Contributor

@zaliqarosli zaliqarosli commented Feb 27, 2020

Brief summary of changes

Reverses changes from #4928 that renames $ValidityEnabled to $validityEnabled and $ValidityRequired to $validityRequired. The variabes are UpperCamerCase elsewhere on Loris. This PR removes the following error that does not allow the Validity flags to render in instruments' control panels

PHP Notice:  Undefined property: NDB_BVL_Instrument_aosi::$validityEnabled in /var/www/loris/php/libraries/NDB_BVL_InstrumentStatus_ControlPanel.class.inc on line 101

PHP Notice:  Undefined property: NDB_BVL_Instrument_aosi::$validityRequired in /var/www/loris/php/libraries/NDB_BVL_InstrumentStatus_ControlPanel.class.inc on line 102

Testing instructions (if applicable)

  1. On master, go to any instrument page and verify that the 'Validity' section in the control panel is not there. In your apache log, you will see the above posted error.
  2. On this branch, the 'Validity' section will appear and you will see no errors in your apache log.

@zaliqarosli zaliqarosli added Category: Bug PR or issue that aims to report or fix a bug Area: UI PR or issue related to the user interface labels Feb 27, 2020
Copy link
Collaborator

@driusan driusan left a comment

Choose a reason for hiding this comment

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

LGTM and it's passing Travis.

@driusan driusan merged commit 3c256b6 into aces:master Feb 27, 2020
@ridz1208 ridz1208 added this to the 23.0.0 milestone Feb 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: UI PR or issue related to the user interface Category: Bug PR or issue that aims to report or fix a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants