------------------------------------------------------------
revno: 14709
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Sun 2014-04-06 23:15:32 +0200
message:
User validation
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-04-05 20:08:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2014-04-06 21:15:32 +0000
@@ -328,4 +328,5 @@
disable=Disable
enable=Enable
data_capture_maintenance_org_units=Data capture and maintenance organisation units
-data_output_analysis_org_units=Data output and analysis organisation units
\ No newline at end of file
+data_output_analysis_org_units=Data output and analysis organisation units
+data_capture_organisation_unit_required_for_user=User must be assigned to at least one data capture organisation unit
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2014-04-06 20:58:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2014-04-06 21:15:32 +0000
@@ -5,8 +5,8 @@
jQuery("#urSelected").children().attr("selected", "selected");
jQuery("#ugSelected").children().attr("selected", "selected");
- if( $('#selectionTree').find('.selected').size() == 0 ) {
- setHeaderDelayMessage('$encoder.jsEncode( $i18n.getString( "organisation_unit_required_for_user" ) )');
+ if( $('#orgUnitTree').find('.selected').size() == 0 ) {
+ setHeaderDelayMessage('$encoder.jsEncode( $i18n.getString( "data_capture_organisation_unit_required_for_user" ) )');
} else {
form.submit();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2014-04-06 20:58:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2014-04-06 21:15:32 +0000
@@ -10,8 +10,8 @@
jQuery("#urSelected").children().attr("selected", "selected");
jQuery("#ugSelected").children().attr("selected", "selected");
- if( $('#selectionTree').find('.selected').size() == 0 ) {
- setHeaderDelayMessage('$i18n.getString( "organisation_unit_required_for_user" )');
+ if( $('#orgUnitTree').find('.selected').size() == 0 ) {
+ setHeaderDelayMessage('$i18n.getString( "data_capture_organisation_unit_required_for_user" )');
} else {
form.submit();
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
