Build #131

Plan branch:

Build: #131 was successful Changes by Daniel Kayiwa

Code commits

Git

  • Daniel Kayiwa

    Daniel Kayiwa 991b29dbcff84f3229c02066f57d711b9fd17115

    Merge pull request #547 from lrozanski/TRUNK-3898
    TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list[d31bfa5_BAM_file_list]
    [d31bfa5_BAM_hash]2afa55477ae71d6318a80c2f96b0ae6939ccdf8a
    [d31bfa5_BAM_commiter_name]Lech Rozanski
    [d31bfa5_BAM_commiter_email]lrozanski@soldevelo.com
    [d31bfa5_BAM_timestamp]1389886048
    [d31bfa5_BAM_commit_message]TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list

    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 991b29dbcff84f3229c02066f57d711b9fd17115)
    • api/src/main/java/org/openmrs/util/ConceptMapTypeComparator.java (version 991b29dbcff84f3229c02066f57d711b9fd17115)
    • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 991b29dbcff84f3229c02066f57d711b9fd17115)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 991b29dbcff84f3229c02066f57d711b9fd17115)
    • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp (version 991b29dbcff84f3229c02066f57d711b9fd17115)
    • webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp (version 991b29dbcff84f3229c02066f57d711b9fd17115)
    • webapp/src/main/webapp/openmrs.css (version 991b29dbcff84f3229c02066f57d711b9fd17115)