dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12651
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3941: implemented ajax-load for user roles in user mgmt
------------------------------------------------------------
revno: 3941
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-06-18 20:19:28 +0300
message:
implemented ajax-load for user roles in user mgmt
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRoles.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java
modified:
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/dhis-web-commons.xml
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/javascript/addUserForm.js
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/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
=== 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<UserAuthorityGroup> userRoles;
+
+ public List<UserAuthorityGroup> getUserRoles()
+ {
+ return this.userRoles;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ userRoles = new ArrayList<UserAuthorityGroup>( 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 @@
<!-- Common actions -->
- <bean id="org.hisp.dhis.commons.action.GetUserAction" class="org.hisp.dhis.commons.action.GetUserAction"
- scope="prototype">
- <property name="userService" ref="org.hisp.dhis.user.UserService" />
- </bean>
-
- <bean id="org.hisp.dhis.commons.action.GetUsersAction" class="org.hisp.dhis.commons.action.GetUsersAction"
- scope="prototype">
+ <bean id="org.hisp.dhis.commons.action.GetUserAction" class="org.hisp.dhis.commons.action.GetUserAction" scope="prototype">
+ <property name="userService" ref="org.hisp.dhis.user.UserService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.commons.action.GetUserRolesAction" class="org.hisp.dhis.commons.action.GetUserRolesAction"
+ scope="prototype">
+ <property name="userService" ref="org.hisp.dhis.user.UserService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.commons.action.GetUsersAction" class="org.hisp.dhis.commons.action.GetUsersAction" scope="prototype">
<property name="userService" ref="org.hisp.dhis.user.UserService" />
</bean>
=== 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 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
+ <action name="getUserRoles" class="org.hisp.dhis.commons.action.GetUserRolesAction">
+ <result name="success" type="velocity-json">
+ /dhis-web-commons/ajax/jsonUserRoles.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
<action name="getUsers" class="org.hisp.dhis.commons.action.GetUsersAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonUsers.vm</result>
=== 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 @@
<script type="text/javascript" src="javascript/addUserForm.js"></script>
+<script type="text/javascript">
+ jQuery(function() {
+ jQuery("#availableList").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getUserRoles.action",
+ iterator: 'userRoles',
+ connectedTo: 'selectedList',
+ handler: function(item) {
+ var option = jQuery("<option />");
+ option.text( item.name );
+ option.attr( "value", item.id );
+
+ return option;
+ }
+ });
+ });
+</script>
<h3>$i18n.getString( "create_new_user" )</h3>
<form id="addUserForm" action="addUser.action" method="post" >
<table>
+ <col style="width: 120px"/>
+ <col style="width: 350px"/>
+ <col/>
+ <col style="width: 350px"/>
+
<tr>
<th colspan="4">$i18n.getString( "details" )</th>
</tr>
+
<tr>
<td><label for="username">$i18n.getString( "username" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="text" id="username" name="username" style="width:20em" autocomplete="off"></td>
</tr>
+
<tr>
<td><label for="rawPassword">$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="password" id="rawPassword" name="rawPassword" style="width:20em" autocomplete="off"></td>
</tr>
+
<tr>
<td><label for="retypePassword">$i18n.getString( "retype_password" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="password" id="retypePassword" name="retypePassword" style="width:20em" autocomplete="off"></td>
</tr>
+
<tr>
<td><label for="surname">$i18n.getString( "surname" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="text" id="surname" name="surname" style="width:20em"></td>
</tr>
+
<tr>
<td><label for="firstName">$i18n.getString( "firstName" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="text" id="firstName" name="firstName" style="width:20em"></td>
</tr>
+
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
<td colspan="3"><input type="text" id="email" name="email" style="width:20em"></td>
</tr>
+
<tr>
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
<td colspan="3"><input type="text" id="phoneNumber" name="phoneNumber" style="width:20em"></td>
</tr>
+
<tr>
<td colspan="4" height="10"></td>
</tr>
+
<tr>
<td></td>
<th>$i18n.getString( "available_roles" )</th>
- <td></td>
+ <th></th>
<th>$i18n.getString( "selected_roles" )
<select id="roleValidator" style="display:none"/>
</th>
</tr>
- <tr>
+
+ <tr style="margin-bottom: 15px;">
<td><label>$i18n.getString( "roles" )</label></td>
+
<td>
- <select size="15" id="availableList" name="availableList" multiple="multiple" style="width:100%;height:12em;" ondblclick="moveSelectedById( 'availableList', 'selectedList' )">
- #foreach ( $availableRole in $userAuthorityGroups )
- <option value="$availableRole.id">$encoder.htmlEncode( $availableRole.name )</option>
- #end
- </select>
- </td>
- <td width="30px">
- <input type="button" value="<" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'selectedList', 'availableList' )"/>
- <br/>
- <input type="button" value=">" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableList', 'selectedList' )"/>
- </td>
+ <select id="availableList" name="availableList" multiple="multiple" style="height: 200px; width: 100%;"></select>
+ </td>
+
+ <td style="text-align:center">
+ <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableList' );"/><br/>
+ <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedList' );"/><br/>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableList' );"/><br/>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedList' );"/>
+ </td>
+
<td>
- <select id="selectedList" name="selectedList" multiple="multiple" style="width:100%;height:12em;" ondblclick="moveSelectedById( 'selectedList', 'availableList' )">
- </select>
+ <select id="selectedList" name="selectedList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;"></select>
</td>
</tr>
- <tr>
- <td colspan="4" height="10"></td>
- </tr>
+
<tr>
<td><label for="selectionTree">$i18n.getString( "organisation_unit" )</label></td>
<td colspan="3">
=== 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 @@
<script type="text/javascript" src="javascript/updateUserForm.js"></script>
+<script type="text/javascript">
+ jQuery(function() {
+ jQuery("#availableList").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getUserRoles.action",
+ iterator: 'userRoles',
+ connectedTo: 'selectedList',
+ handler: function(item) {
+ var option = jQuery("<option />");
+ option.text( item.name );
+ option.attr( "value", item.id );
+
+ return option;
+ }
+ });
+ });
+</script>
<h3>$i18n.getString( "edit_user" )</h3>
@@ -9,73 +25,85 @@
</div>
<table>
+ <col style="width: 120px"/>
+ <col style="width: 350px"/>
+ <col/>
+ <col style="width: 350px"/>
+
<tr>
<th colspan="4">$i18n.getString( "details" )</th>
</tr>
+
<tr>
<td><label for="username">$i18n.getString( "username" )</label></td>
<td colspan="3"><input type="text" id="username" name="username" value="$encoder.htmlEncode( $userCredentials.username )" style="width:20em" disabled="disabled" autocomplete="off"/></td>
</tr>
+
<tr>
<td><label for="rawPassword">$i18n.getString( "password" )</label></td>
<td colspan="3"><input type="password" id="rawPassword" name="rawPassword" style="width:20em" autocomplete="off"></td>
</tr>
+
<tr>
<td><label for="retypePassword">$i18n.getString( "retype_password" ) </label></td>
<td colspan="3"><input type="password" id="retypePassword" name="retypePassword" style="width:20em" autocomplete="off"></td>
</tr>
+
<tr>
<td><label for="surname">$i18n.getString( "surname" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="text" id="surname" name="surname" value="$encoder.htmlEncode( $userCredentials.user.surname )" style="width:20em"></td>
</tr>
+
<tr>
<td><label for="firstName">$i18n.getString( "firstName" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td colspan="3"><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $userCredentials.user.firstName )" style="width:20em"></td>
</tr>
+
<tr>
<td><label for="email">$i18n.getString( "email" )</label></td>
<td colspan="3"><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $userCredentials.user.email )" style="width:20em"></td>
</tr>
+
<tr>
<td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
<td colspan="3"><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $userCredentials.user.phoneNumber )" style="width:20em"/></td>
</tr>
+
<tr>
<td colspan="4" height="10"></td>
</tr>
+
<tr>
<td></td>
<th>$i18n.getString( "available" )</th>
- <td></td>
+ <th></th>
<th>$i18n.getString( "selected" )
<select id="roleValidator" style="display:none"/>
</th>
</tr>
+
<tr>
<td><label>$i18n.getString( "roles" )</label></td>
<td>
- <select size="15" id="availableList" name="availableList" multiple="multiple" style="width:100%;height:12em;" ondblclick="moveSelectedById( 'availableList', 'selectedList' )">
- #foreach ( $availableRole in $userAuthorityGroups )
- <option value="$availableRole.id">$encoder.htmlEncode( $availableRole.name )</option>
- #end
- </select>
- </td>
- <td>
- <input type="button" value="<" onclick="moveSelectedById( 'selectedList', 'availableList' )"/>
- <br/>
- <input type="button" value=">" onclick="moveSelectedById( 'availableList', 'selectedList' )"/>
- </td>
+ <select id="availableList" name="availableList" multiple="multiple" style="height: 200px; width: 100%;"></select>
+ </td>
+
+ <td style="text-align:center">
+ <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'availableList' );"/><br/>
+ <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="dhisAjaxSelect_moveAllSelected( 'selectedList' );"/><br/>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'availableList' );"/><br/>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="dhisAjaxSelect_moveAll( 'selectedList' );"/>
+ </td>
+
<td>
- <select id="selectedList" name="selectedList" multiple="multiple" style="width:100%;height:12em;" ondblclick="moveSelectedById( 'selectedList', 'availableList' )">
+ <select id="selectedList" name="selectedList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
#foreach ( $selectedRole in $userCredentials.userAuthorityGroups )
<option value="$selectedRole.id">$encoder.htmlEncode( $selectedRole.name )</option>
#end
</select>
</td>
</tr>
- <tr>
- <td colspan="4" height="10"></td>
- </tr>
+
<tr>
<td><label for="selectionTree">$i18n.getString( "organisation_unit" )</label></td>
<td colspan="3">
