Merge authors:
Halvdan Hoem Grelland (halvdanhg)
revision-diff.txt (16.1 KB)
···
------------------------------------------------------------
revno: 17451 [merge]
committer: Halvdan Hoem Grelland <halvdanhg@gmail.com>
branch nick: dhis2
timestamp: Wed 2014-11-12 16:12:24 +0100
message:
Improved add and edit for user groups in dashboard. Now uses partial load for user selector.
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupAction.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/UpdateUserGroupAction.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress