=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/UpdateUserAccountAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/UpdateUserAccountAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/UpdateUserAccountAction.java 2014-06-22 12:36:40 +0000
@@ -53,6 +53,7 @@
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
+
private I18n i18n;
private Integer id;
@@ -137,7 +138,6 @@
public String execute()
throws Exception
{
-
// ---------------------------------------------------------------------
// Prepare values
// ---------------------------------------------------------------------
@@ -182,7 +182,6 @@
userCredentials.setPassword( passwordManager.encodePassword( userCredentials.getUsername(), rawPassword ) );
userService.updateUserCredentials( userCredentials );
-
}
userService.updateUser( user );
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2014-03-13 23:07:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2014-06-22 12:36:40 +0000
@@ -898,7 +898,7 @@
/dhis-web-commons/ajax/jsonResponseSuccess.vm
-
+
/dhis-web-commons/ajax/jsonResponseError.vm
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2014-06-17 12:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2014-06-22 12:36:40 +0000
@@ -495,4 +495,5 @@
auto_save_registration_forms = Auto save registration form
show_advanced_options = Show advanced options
hide_advanced_options = Hide advanced options
-tracked_entity_registration_form_manegement = Tracked entity registration form management
\ No newline at end of file
+tracked_entity_registration_form_manegement = Tracked entity registration form management
+program_validation_rule_management=Program validation rule management
\ No newline at end of file