Build #701

Plan branch:
OpenMRS Core Master

Build: #701 was successful Changes by Wyclif Luyima and geoff-wasilwa <geoffreywanjala@gmail.com>

Stages & jobs

  1. Build and Test

Code commits

openmrs-core

  • Wyclif Luyima

    Wyclif Luyima 3916c326a8c91b3dcc0183c85893e0c4c48dd7a1

    Follow up - TRUNK-3840

    • api/src/main/java/org/openmrs/Concept.java (version 3916c326a8c91b3dcc0183c85893e0c4c48dd7a1)
    • api/src/main/java/org/openmrs/ConceptSet.java (version 3916c326a8c91b3dcc0183c85893e0c4c48dd7a1)
    • api/src/test/java/org/openmrs/ConceptTest.java (version 3916c326a8c91b3dcc0183c85893e0c4c48dd7a1)
  • geoff-wasilwa <geoffreywanjala@gmail.com>

    geoff-wasilwa <geoffreywanjala@gmail.com> 6aa5ae19e59bb396b069efabdaa306abb8c14857

    TRUNK-3840: Refactoring code to display retired set member
    Refactored concept.jsp; removed repeated code.
    Add code to ConceptSet.java to factor in retired concepts while sorting
    Added unit test for new behavior

    Updated concept.jsp view and ConceptFormController

    Factored in null weights

    Changed ConceptSet compateTo method to use OpenmrsUtil's compateWithNullAsLowest

    • api/src/main/java/org/openmrs/ConceptSet.java (version 6aa5ae19e59bb396b069efabdaa306abb8c14857)
    • api/src/test/java/org/openmrs/ConceptTest.java (version 6aa5ae19e59bb396b069efabdaa306abb8c14857)
    • webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp (version 6aa5ae19e59bb396b069efabdaa306abb8c14857)