dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19630
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8647: Implemented system setting for which user role to use for user self registration
------------------------------------------------------------
revno: 8647
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 20:48:19 +0200
message:
Implemented system setting for which user role to use for user self registration
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAccessSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.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-api/src/main/java/org/hisp/dhis/configuration/Configuration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2012-09-24 14:34:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2012-10-22 18:48:19 +0000
@@ -33,6 +33,7 @@
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.period.YearlyPeriodType;
+import org.hisp.dhis.user.UserAuthorityGroup;
import org.hisp.dhis.user.UserGroup;
/**
@@ -58,6 +59,8 @@
private PeriodType infrastructuralPeriodType;
+ private UserAuthorityGroup selfRegistrationRole;
+
public Configuration()
{
}
@@ -124,4 +127,14 @@
{
this.infrastructuralPeriodType = infrastructuralPeriodType;
}
+
+ public UserAuthorityGroup getSelfRegistrationRole()
+ {
+ return selfRegistrationRole;
+ }
+
+ public void setSelfRegistrationRole( UserAuthorityGroup selfRegistrationRole )
+ {
+ this.selfRegistrationRole = selfRegistrationRole;
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2012-09-24 14:34:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml 2012-10-22 18:48:19 +0000
@@ -22,5 +22,8 @@
<many-to-one name="infrastructuralPeriodType" class="org.hisp.dhis.period.PeriodType"
column="infrastructuralperiodtypeid" foreign-key="fk_configuration_infrastructural_periodtype" />
+ <many-to-one name="selfRegistrationRole" class="org.hisp.dhis.user.UserAuthorityGroup"
+ column="selfregistrationrole" foreign-key="fk_configuration_selfregistrationrole" unique="true" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java 2012-10-22 18:02:46 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java 2012-10-22 18:48:19 +0000
@@ -40,7 +40,6 @@
import org.hisp.dhis.user.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAccessSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAccessSettingsAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAccessSettingsAction.java 2012-10-22 18:48:19 +0000
@@ -0,0 +1,87 @@
+package org.hisp.dhis.settings.action.system;
+
+/*
+ * Copyright (c) 2004-2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.configuration.Configuration;
+import org.hisp.dhis.configuration.ConfigurationService;
+import org.hisp.dhis.user.UserAuthorityGroup;
+import org.hisp.dhis.user.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class GetAccessSettingsAction
+ implements Action
+{
+ @Autowired
+ private ConfigurationService configurationService;
+
+ @Autowired
+ private UserService userService;
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private Configuration configuration;
+
+ public Configuration getConfiguration()
+ {
+ return configuration;
+ }
+
+ private List<UserAuthorityGroup> userRoles = new ArrayList<UserAuthorityGroup>();
+
+ public List<UserAuthorityGroup> getUserRoles()
+ {
+ return userRoles;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ configuration = configurationService.getConfiguration();
+
+ userRoles = new ArrayList<UserAuthorityGroup>( userService.getAllUserAuthorityGroups() );
+
+ Collections.sort( userRoles, IdentifiableObjectNameComparator.INSTANCE );
+
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java 2012-02-02 20:01:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java 2012-10-22 18:48:19 +0000
@@ -42,7 +42,6 @@
/**
* @author Lars Helge Overland
- * @version $Id$
*/
public class GetAppearanceSettingsAction
implements Action
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java 2012-10-22 18:48:19 +0000
@@ -0,0 +1,96 @@
+package org.hisp.dhis.settings.action.system;
+
+/*
+ * Copyright (c) 2004-2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.configuration.Configuration;
+import org.hisp.dhis.configuration.ConfigurationService;
+import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.user.UserAuthorityGroup;
+import org.hisp.dhis.user.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class SetAccessSettingsAction
+ implements Action
+{
+ @Autowired
+ private ConfigurationService configurationService;
+
+ @Autowired
+ private UserService userService;
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private Integer selfRegistrationRole;
+
+ public void setSelfRegistrationRole( Integer selfRegistrationRole )
+ {
+ this.selfRegistrationRole = selfRegistrationRole;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ private I18n i18n;
+
+ public void setI18n( I18n i18n )
+ {
+ this.i18n = i18n;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ UserAuthorityGroup group = userService.getUserAuthorityGroup( selfRegistrationRole );
+
+ Configuration config = configurationService.getConfiguration();
+ config.setSelfRegistrationRole( group );
+ configurationService.setConfiguration( config );
+
+ message = i18n.getString( "settings_updated" );
+
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2012-10-22 18:48:19 +0000
@@ -53,4 +53,12 @@
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
</bean>
+ <bean id="org.hisp.dhis.settings.action.system.GetAccessSettingsAction"
+ class="org.hisp.dhis.settings.action.system.GetAccessSettingsAction"
+ scope="prototype"/>
+
+ <bean id="org.hisp.dhis.settings.action.system.SetAccessSettingsAction"
+ class="org.hisp.dhis.settings.action.system.SetAccessSettingsAction"
+ scope="prototype"/>
+
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2012-10-16 13:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2012-10-22 18:48:19 +0000
@@ -63,9 +63,11 @@
intro_system_general_settings=Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more.
intro_system_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page.
intro_system_email_settings=Configure the email SMTP setup with regard to host name, user name and password.
+intro_system_access_settings=Configure access to the system, like which user role should be used for user self registration.
system_general_settings=System General Settings
system_appearance_settings=System Appearance Settings
system_email_settings=System Email Settings
+system_access_settings=System Access Settings
general=General
appearance=Appearance
email=Email
@@ -100,4 +102,9 @@
solomon_islands=Solomon Islands
vanuatu=Vanuatu
timor_leste=Timor-Leste
-application_introduction=Application introduction
\ No newline at end of file
+application_introduction=Application introduction
+do_not_allow_self_registration=Do not allow self registration
+access_settings=Access settings
+do_not_allow_self_registration=Do not allow self registration
+self_registration_account_user_role=Self registration account user role
+access=Access
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2012-10-22 18:48:19 +0000
@@ -14,8 +14,7 @@
<param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
</action>
- <!-- System settings -->
- <!-- General settings -->
+ <!-- General settings -->
<action name="systemGeneralSettings" class="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction">
<result name="success" type="velocity">/main.vm</result>
@@ -30,7 +29,7 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- Appearance settings -->
+ <!-- Appearance settings -->
<action name="systemAppearanceSettings" class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction">
<result name="success" type="velocity">/main.vm</result>
@@ -45,7 +44,7 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- Email settings -->
+ <!-- Email settings -->
<action name="systemEmailSettings" class="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction">
<result name="success" type="velocity">/main.vm</result>
@@ -59,6 +58,21 @@
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
-
+
+ <!-- Access settings -->
+
+ <action name="systemAccessSettings" class="org.hisp.dhis.settings.action.system.GetAccessSettingsAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-settings/systemAccessSettings.vm</param>
+ <param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
+ <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
+ </action>
+
+ <action name="setSystemAccessSettings" class="org.hisp.dhis.settings.action.system.SetAccessSettingsAction">
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
</package>
</struts>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 2012-10-22 18:48:19 +0000
@@ -11,5 +11,6 @@
#introListImgItem( "systemGeneralSettings.action" "system_general_settings" "systemsettings" )
#introListImgItem( "systemAppearanceSettings.action" "system_appearance_settings" "systemsettings" )
#introListImgItem( "systemEmailSettings.action" "system_email_settings" "systemsettings" )
+ #introListImgItem( "systemAccessSettings.action" "system_access_settings" "systemsettings" )
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm 2012-10-22 18:48:19 +0000
@@ -3,4 +3,5 @@
<li><a href="systemGeneralSettings.action">$i18n.getString( "general" ) </a></li>
<li><a href="systemAppearanceSettings.action">$i18n.getString( "appearance" ) </a></li>
<li><a href="systemEmailSettings.action">$i18n.getString( "email" ) </a></li>
+ <li><a href="systemAccessSettings.action">$i18n.getString( "access" ) </a></li>
</ul>
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm 2012-10-22 18:48:19 +0000
@@ -0,0 +1,31 @@
+<script type="text/javascript">
+jQuery( document ).ready( function() {
+ jQuery( "input[type=button]" ).click( function() {
+ jQuery.postUTF8( "setSystemAccessSettings.action", {
+ selfRegistrationRole: jQuery( "#selfRegistrationRole" ).val()
+ }, function( json ) {
+ if ( json.response == "success" ) {
+ setHeaderDelayMessage( json.message );
+ }
+ } );
+ } );
+} );
+</script>
+
+#set( $curRole = $configuration.selfRegistrationRole )
+
+<h3>$i18n.getString( "access_settings" )</h3>
+
+<div class="settingLabel">$i18n.getString( "self_registration_account_user_role" )</div>
+
+<div class="setting">
+<select id="selfRegistrationRole" name="selfRegistrationRole">
+ <option>$i18n.getString( "do_not_allow_self_registration" )</option>
+ <option>---</option>
+ #foreach( $role in $userRoles )
+ <option value="$role.id" #if( $curRole && $role.id == $curRole.id )selected="selected"#end>$i18n.getString( $role.name )</option>
+ #end
+</select>
+</div>
+
+<div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm 2012-10-16 13:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm 2012-10-22 18:48:19 +0000
@@ -8,8 +8,9 @@
flag: getFieldValue( 'flag' ),
startModule: getFieldValue( 'startModule' )
}, function( json ) {
- if ( json.response == "success" )
+ if ( json.response == "success" ) {
setHeaderDelayMessage( json.message );
+ }
});
});
});
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm 2012-10-16 13:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm 2012-10-22 18:48:19 +0000
@@ -6,8 +6,9 @@
smtpUsername: getFieldValue( 'smtpUsername' ),
smtpPassword: getFieldValue( 'smtpPassword' )
}, function( json ) {
- if ( json.response == "success" )
+ if ( json.response == "success" ) {
setHeaderDelayMessage( json.message );
+ }
});
}, {
"rules" : getValidationRules( "emailSettings" )
@@ -33,6 +34,6 @@
<div class="setting"><input type="password" id="smtpPassword" name="smtpPassword" value="$!smtpPassword" style="width:20em" autocomplete="off"/></div>
-<div class="settingLabel"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/></div>
+<div class="setting"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/></div>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-10-16 13:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2012-10-22 18:48:19 +0000
@@ -12,8 +12,9 @@
completenessOffset: getFieldValue( 'completenessOffset' ),
phoneNumberAreaCode: getFieldValue( 'phoneNumberAreaCode' )
}, function( json ) {
- if ( json.response == "success" )
+ if ( json.response == "success" ) {
setHeaderDelayMessage( json.message );
+ }
});
});
});
