=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRoles.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRoles.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRoles.vm 2011-06-18 17:19:28 +0000 @@ -0,0 +1,14 @@ +#set( $size = $userRoles.size() ) +{ "userRoles": [ +#foreach( $userRole in $userRoles ) + { + "id": ${userRole.id}, + "name": "$!encoder.jsonEncode( ${userRole.name} )", + "description": "$!encoder.jsonEncode( ${userRole.description} )" + }#if( $velocityCount < $size ),#end +#end +] +#if( $usePaging ), + "paging":#parse( "/dhis-web-commons/ajax/jsonPaging.vm" ) +#end +} === added file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java 2011-06-18 17:19:28 +0000 @@ -0,0 +1,78 @@ +package org.hisp.dhis.commons.action; + +/* + * Copyright (c) 2004-2010, 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.List; + +import org.hisp.dhis.user.UserAuthorityGroup; +import org.hisp.dhis.user.UserService; + +import com.opensymphony.xwork2.Action; + +/** + * @author mortenoh + */ +public class GetUserRolesAction + implements Action +{ + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + + private UserService userService; + + public void setUserService( UserService userService ) + { + this.userService = userService; + } + + // ------------------------------------------------------------------------- + // Input & Output + // ------------------------------------------------------------------------- + + private List userRoles; + + public List getUserRoles() + { + return this.userRoles; + } + + // ------------------------------------------------------------------------- + // Action implementation + // ------------------------------------------------------------------------- + + public String execute() + throws Exception + { + userRoles = new ArrayList( userService.getAllUserAuthorityGroups() ); + + return SUCCESS; + } + +} === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2011-06-17 11:38:43 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2011-06-18 17:19:28 +0000 @@ -320,13 +320,16 @@ - - - - - + + + + + + + + + === 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 2011-06-17 11:38:43 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-06-18 17:19:28 +0000 @@ -403,6 +403,12 @@ plainTextError + + + /dhis-web-commons/ajax/jsonUserRoles.vm + plainTextError + + /dhis-web-commons/ajax/jsonUsers.vm === 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 2011-03-24 13:32:53 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2011-06-18 17:19:28 +0000 @@ -1,73 +1,101 @@ +

$i18n.getString( "create_new_user" )

+ + + + + + + + + + + + + + - + - + + + - + + + + + - - - +
$i18n.getString( "details" )
$i18n.getString( "available_roles" ) $i18n.getString( "selected_roles" )
- - - -
- - 		+
+
+
+ + 		- +
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js 2011-04-11 09:51:38 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/addUserForm.js 2011-06-18 17:19:28 +0000 @@ -1,20 +1,22 @@ -jQuery( document ).ready( function() +jQuery(document).ready(function() { - validation2( 'addUserForm', function( form ) - { - form.submit() - }, { - 'beforeValidateHandler' : function() - { - listValidator( 'roleValidator', 'selectedList' ); - }, - 'rules' : getValidationRules("user") - } ); - - /* remote validation */ - checkValueIsExist( "username", "validateUser.action" ); - - jQuery("#cancel").click(function() { - referrerBack( "alluser.action" ); - }); + validation2('addUserForm', function( form ) + { + jQuery("#selectedList").children().attr("selected", true); + form.submit() + }, { + 'beforeValidateHandler' : function() + { + listValidator('roleValidator', 'selectedList'); + }, + 'rules' : getValidationRules("user") + }); + + /* remote validation */ + checkValueIsExist("username", "validateUser.action"); + + jQuery("#cancel").click(function() + { + referrerBack("alluser.action"); + }); }); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js 2011-04-15 11:31:42 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js 2011-06-18 17:19:28 +0000 @@ -6,9 +6,9 @@ validation2('updateUserForm', function( form ) { + jQuery("#selectedList").children().attr("selected", true); form.submit() - }, - { + }, { 'beforeValidateHandler' : function() { listValidator('roleValidator', 'selectedList'); === 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 2011-04-15 11:31:42 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2011-06-18 17:19:28 +0000 @@ -1,4 +1,20 @@ +

$i18n.getString( "edit_user" )

@@ -9,73 +25,85 @@ + + + + + + + + + + + + + + - + + - + + + + + - - - +
$i18n.getString( "details" )
$i18n.getString( "available" ) $i18n.getString( "selected" )
- - - -
- - 		+
+
+
+ + 		- #foreach ( $selectedRole in $userCredentials.userAuthorityGroups ) #end