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

Trunk 4033 #390

Closed
wants to merge 6 commits into from
Closed

Trunk 4033 #390

wants to merge 6 commits into from

Conversation

k-joseph
Copy link
Member

fix for [Trunk 4033] locking mechanism for encounter_type

*
* @see OpenmrsConstants#GLOBAL_PROPERTY_ENCOUNTER_TYPES_LOCKED
* @see PersonService#checkIfLocked()
*/
Copy link
Member

Choose a reason for hiding this comment

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

Add @SInCE 1.10 added to 1.8.5 and 1.9.4

@wluyima
Copy link
Member

wluyima commented Aug 20, 2013

@joseph, in the description of the PR, you need to include the url of the ticket instead of just the ticket number

@@ -121,7 +121,7 @@
<h4><openmrs:message code="EncounterType.unretireEncounterType"/></h4>

<br/>
<input type="submit" value='<openmrs:message code="EncounterType.unretireEncounterType"/>' name="unretire"/>
Copy link
Member

Choose a reason for hiding this comment

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

You need to hide/disable all edit, save, retire, unretire, purge/delete buttons on the form

EncounterType encounterType = new EncounterType("testing", "desc");

String locked = Context.getAdministrationService().getGlobalProperty(
OpenmrsConstants.GLOBAL_PROPERTY_ENCOUNTER_TYPES_LOCKED, "false");
Copy link
Member

Choose a reason for hiding this comment

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

This test method seems not quite right, it says should not save encounter type of locked but you are doing the opposite, your test should using @test(expected) to check that the exception was thrown and not use the if clause

@wluyima wluyima closed this Aug 29, 2013
RandilaP pushed a commit to RandilaP/openmrs-core that referenced this pull request Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants