Build #130

Plan branch:

Build: #130 was successful Scheduled with changes by 4 people

Code commits

openmrs-core master

  • Daniel Kayiwa

    Daniel Kayiwa 5528027a81c855dd51538e415b546d443bbd36d8

    Merge pull request #914 from harsha89/TRUNK-15
    added required changes for validators to avoid duplicate names TRUNK-15

  • Daniel Kayiwa

    Daniel Kayiwa dce6eb5f056806d618fc6c767a54af80cd06f8f9

    Merge pull request #906 from kohousim/TRUNK-2682
    TRUNK-2682

  • Daniel Kayiwa

    Daniel Kayiwa 28c11a4b3be3fcc787ab2bfa6daa33847e9df0a2

    Merge pull request #883 from kkaczmarczyk/TRUNK-4036-master
    TRUNK-4036 Retiring a Location also retires the location tag

  • kohousim <kohousim@fel.cvut.cz>

    kohousim <kohousim@fel.cvut.cz> ed14239ae1d91e7014d1f583a9958bab0cde40db

    TRUNK-2682: Modify Concept getNameInLocale(Locale), getPreferredName(Locale), getFullSpecifiedName(Locale) to find names that have compatible Locale matches if no exact Locale match

    • api/src/main/java/org/openmrs/Concept.java (version ed14239ae1d91e7014d1f583a9958bab0cde40db)
    • api/src/test/java/org/openmrs/ConceptTest.java (version ed14239ae1d91e7014d1f583a9958bab0cde40db)
  • harsha89 <harsz89@gmail.com>

    harsha89 <harsz89@gmail.com> 1156c31838747e9ef8484a1654f5cec416b537d6

    i# This is a combination of 2 commits.
    added required changes for validators to avoid duplicate names TRUNK-15

    • api/src/main/java/org/openmrs/api/FormService.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/api/db/FormDAO.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/validator/ConceptClassValidator.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/validator/EncounterTypeValidator.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/validator/FieldTypeValidator.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/validator/LocationValidator.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/validator/PatientIdentifierTypeValidator.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/main/java/org/openmrs/validator/RelationshipTypeValidator.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/test/java/org/openmrs/validator/ConceptClassValidatorTest.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/test/java/org/openmrs/validator/FieldTypeValidatorTest.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/test/java/org/openmrs/validator/LocationValidatorTest.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/test/java/org/openmrs/validator/PatientIdentifierTypeValidatorTest.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • api/src/test/java/org/openmrs/validator/RelationshipTypeValidatorTest.java (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptClassForm.jsp (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp (version 1156c31838747e9ef8484a1654f5cec416b537d6)
    • webapp/src/main/webapp/WEB-INF/view/admin/person/relationshipTypeForm.jsp (version 1156c31838747e9ef8484a1654f5cec416b537d6)
  • Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com>

    Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com> f9b1bd4253419a0b51a8e97171f482ac06d40e15

    Filled Independent annotation description

    • api/src/main/java/org/openmrs/annotation/Independent.java (version f9b1bd4253419a0b51a8e97171f482ac06d40e15)
  • Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com>

    Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com> 13786e54ac1bd6fb2fd5188150e8eeacdde9e986

    TRUNK-4036 Retiring a Location also retires the location tag

    • api/src/main/java/org/openmrs/Location.java (version 13786e54ac1bd6fb2fd5188150e8eeacdde9e986)
    • api/src/main/java/org/openmrs/annotation/Independent.java (version 13786e54ac1bd6fb2fd5188150e8eeacdde9e986)
    • api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (version 13786e54ac1bd6fb2fd5188150e8eeacdde9e986)
    • api/src/test/java/org/openmrs/api/LocationServiceTest.java (version 13786e54ac1bd6fb2fd5188150e8eeacdde9e986)