OpenMRS Core Master

Build: #896 was successful Changes by Michael Souza <mike@michaelsouza.com> and Daniel Kayiwa

Stages & jobs

  1. Build and Test

  2. Deploy

Code commits

openmrs-core

  • Daniel Kayiwa

    Daniel Kayiwa d8a9a723d38c8154d08e9fe19b0a39c937b419f5

    Merge pull request #1491 from midnighteuler/TRUNK-4497
    TRUNK-4497: Hide or disable (option of selecting) a child role instead o...

  • Michael Souza <mike@michaelsouza.com>

    Michael Souza <mike@michaelsouza.com> fcd4655613e40cd1642e38cf54e9ec14784e54fb

    TRUNK-4497: Hide or disable (option of selecting) a child role instead of throwing an error

    • api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • api/src/test/java/org/openmrs/api/UserServiceTest.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • web/src/main/java/org/openmrs/web/controller/user/RoleFormController.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • web/src/main/java/org/openmrs/web/taglib/ListPickerTag.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/messages_de.properties (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/messages_es.properties (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)