OpenMRS Core Master

Build: #265 was successful Changes by Daniel Kayiwa

Code commits

openmrs-core

  • Daniel Kayiwa

    Daniel Kayiwa 2d2b4b8aeb18d4a985b370de0e572488bde4452a

    Merge pull request #549 from lrozanski/TRUNK-3898-master
    TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list[d31bfa5_BAM_file_list]
    [d31bfa5_BAM_hash]f2d99ca3f3ec8c7afea99bbe60d7d402cbaf7414
    [d31bfa5_BAM_commiter_name]Lech Rozanski
    [d31bfa5_BAM_commiter_email]lrozanski@soldevelo.com
    [d31bfa5_BAM_timestamp]1389952517
    [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 2d2b4b8aeb18d4a985b370de0e572488bde4452a)
    • api/src/main/java/org/openmrs/util/ConceptMapTypeComparator.java (version 2d2b4b8aeb18d4a985b370de0e572488bde4452a)
    • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 2d2b4b8aeb18d4a985b370de0e572488bde4452a)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 2d2b4b8aeb18d4a985b370de0e572488bde4452a)
    • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp (version 2d2b4b8aeb18d4a985b370de0e572488bde4452a)
    • webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp (version 2d2b4b8aeb18d4a985b370de0e572488bde4452a)