Code commits
openmrs-core master
-
Ivo Ulrich <teleivo@users.noreply.github.com> 7606d3e69fbf433a9ccb91241408b6124d826610
Merge pull request #2180 from teleivo/TRUNK-5157
TRUNK-5157 ProgramWorkflowEditor tries to get state by uuid twice -
teleivo <mrteleivo@gmail.com> c1d26c728149614a7c1dce1db7557308a16da46c
TRUNK-5157 ProgramWorkflowEditor tries to get state by uuid twice
the catch block will never be reached since getByUuid() just returns
null if nothing is found. The exception in the try block is normally
thrown by Integer.valueOf() if the text is a uuid and not a number
* use getState(Integer) first to try to get the ProgramWorkflow by
its id
* is text is not an Integer, the exception in Integer.valueOf will lead
to the catch block being executed which then tries to fetch by the uuid
* added tests- api/src/main/java/org/openmrs/propertyeditor/ProgramWorkflowEditor.java (version c1d26c728149614a7c1dce1db7557308a16da46c)
- api/src/test/java/org/openmrs/propertyeditor/ProgramWorkflowEditorTest.java (version c1d26c728149614a7c1dce1db7557308a16da46c)
-
Ivo Ulrich <teleivo@users.noreply.github.com> 58bac16a8152307887741c1b2298c3d6581f15a1
Merge pull request #2179 from teleivo/TRUNK-5154
TRUNK-5154 ProgramWorkflowStateEditor tries to get state by uuid twice -
teleivo <mrteleivo@gmail.com> eba7a0a14e2ac86c5e55ab85b5f139ab972066b0
TRUNK-5154 ProgramWorkflowStateEditor tries to get state by uuid twice
the catch block will never be reached since getByUuid() just returns
null if nothing is found. The exception in the try block is normally
thrown by Integer.valueOf() if the text is a uuid and not a number
* use getState(Integer) first to try to get the ProgramWorkflowState by
its id
* is text is not an Integer, the exception in Integer.valueOf will lead
to the catch block being executed which then tries to fetch by the uuid
* added tests- api/src/main/java/org/openmrs/propertyeditor/ProgramWorkflowStateEditor.java (version eba7a0a14e2ac86c5e55ab85b5f139ab972066b0)
- api/src/test/java/org/openmrs/propertyeditor/ProgramWorkflowStateEditorTest.java (version eba7a0a14e2ac86c5e55ab85b5f139ab972066b0)
-
Ivo Ulrich <teleivo@users.noreply.github.com> 084dde5112e327d75e44494fc182710a434a2e13
Merge pull request #2178 from teleivo/TRUNK-5155-real
TRUNK-5155 Add ProgramWorkflowService.getState(Integer) -
teleivo <mrteleivo@gmail.com> 415974dc7618f33a3b1af815e946689d136c3568
TRUNK-5155 Add ProgramWorkflowService.getState(Integer)
- api/src/main/java/org/openmrs/api/ProgramWorkflowService.java (version 415974dc7618f33a3b1af815e946689d136c3568)
- api/src/main/java/org/openmrs/api/db/ProgramWorkflowDAO.java (version 415974dc7618f33a3b1af815e946689d136c3568)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateProgramWorkflowDAO.java (version 415974dc7618f33a3b1af815e946689d136c3568)
- api/src/main/java/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (version 415974dc7618f33a3b1af815e946689d136c3568)
- api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java (version 415974dc7618f33a3b1af815e946689d136c3568)
-
Ivo Ulrich <teleivo@users.noreply.github.com> 3076d9b4a0d3ef8e92c0f08d4791f550423f9c0c
Merge pull request #2177 from teleivo/TRUNK-5155
TRUNK-5156 Add ProgramWorkflowService.getWorkflow(Integer) -
teleivo <mrteleivo@gmail.com> bd101b57c69def40ebf3b83310eaf55e74e997c7
TRUNK-5156 Add ProgramWorkflowService.getWorkflow(Integer)
add ProgramWorkflow getWorkflow(Integer) in
ProgramWorkflowService
ProgramWorkflowServiceDAO
HibernateProgramWorkflowServiceDAO
ProgramWorkflowServiceImpl- api/src/main/java/org/openmrs/api/ProgramWorkflowService.java (version bd101b57c69def40ebf3b83310eaf55e74e997c7)
- api/src/main/java/org/openmrs/api/db/ProgramWorkflowDAO.java (version bd101b57c69def40ebf3b83310eaf55e74e997c7)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateProgramWorkflowDAO.java (version bd101b57c69def40ebf3b83310eaf55e74e997c7)
- api/src/main/java/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (version bd101b57c69def40ebf3b83310eaf55e74e997c7)
- api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java (version bd101b57c69def40ebf3b83310eaf55e74e997c7)
-
Ivo Ulrich <teleivo@users.noreply.github.com> 7eafde62f5438c2632b7741a0f1ea01ba9084e29
Merge pull request #2176 from teleivo/TRUNK-5159
TRUNK-5159 Remove isAuthenticated check in PropertyEditors -
teleivo <mrteleivo@gmail.com> fd9cfa9a9e4358d82c60218313d51aecb054fd28
TRUNK-5159 Remove isAuthenticated check in PropertyEditors
Remove isAuthenticated check in PropertyEditors.setAsText()
ConceptAttributeTypeEditor.java
LocationAttributeTypeEditor.java
LocationTagEditor.java
which is not needed- api/src/main/java/org/openmrs/propertyeditor/ConceptAttributeTypeEditor.java (version fd9cfa9a9e4358d82c60218313d51aecb054fd28)
- api/src/main/java/org/openmrs/propertyeditor/LocationAttributeTypeEditor.java (version fd9cfa9a9e4358d82c60218313d51aecb054fd28)
- api/src/main/java/org/openmrs/propertyeditor/LocationTagEditor.java (version fd9cfa9a9e4358d82c60218313d51aecb054fd28)
-
Ivo Ulrich <teleivo@users.noreply.github.com> 311b89196dfd11f73b117b6c7a1292a2e8f186c1
Merge pull request #2175 from Ankitkumar94/TRUNK-5052
TRUNK-5052 : Extract methods from getVisitTypesToStop -
Ankit kumar <rajadelhi94@gmail.com> 2c427a65637b4d4fa26178c094d2ec628db587ef
TRUNK-5052 : Extract methods from getVisitTypesToStop
- api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java (version 2c427a65637b4d4fa26178c094d2ec628db587ef)
