Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.4 -r1.5
--- lams_admin/conf/xdoclet/struts-forms.xml	16 Jun 2006 06:57:54 -0000	1.4
+++ lams_admin/conf/xdoclet/struts-forms.xml	22 Jun 2006 05:41:36 -0000	1.5
@@ -32,9 +32,5 @@
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeLanguage" type="java.lang.String" />
 	<form-property name="localeCountry" type="java.lang.String" />
-	<form-property name="learner" type="java.lang.String" />
-	<form-property name="author" type="java.lang.String" />
-	<form-property name="staff" type="java.lang.String" />
-	<form-property name="admin" type="java.lang.String" />
-	<form-property name="manager" type="java.lang.String" />
+    <form-property name="roles" type="java.lang.String[]" />
 </form-bean>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v
diff -u -r1.8 -r1.9
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	19 Jun 2006 05:38:52 -0000	1.8
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	22 Jun 2006 05:41:36 -0000	1.9
@@ -24,6 +24,9 @@
 /* $Id$ */
 package org.lamsfoundation.lams.admin.web;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -37,9 +40,10 @@
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.usermanagement.Country;
 import org.lamsfoundation.lams.usermanagement.Language;
-import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -74,20 +78,6 @@
     private static List countries = service.findAll(Country.class);
 	private static List languages = service.findAll(Language.class);
 	
-	public ActionForward add(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws Exception {
-        // retain orgId to return to userlist
-		Integer orgId = WebUtil.readIntParam(request,"orgId");
-		Organisation organisation = (Organisation)service.findById(Organisation.class,orgId);
-		Integer parentId = organisation.getParentOrganisation().getOrganisationId();
-
-		request.setAttribute("org",orgId);
-		request.setAttribute("parent",parentId);
-		return mapping.findForward("userlist");
-	}
-	
 	public ActionForward edit(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
@@ -105,23 +95,36 @@
 			User user = (User)service.findById(User.class,userId);
 			DynaActionForm userForm = (DynaActionForm)form;
 			BeanUtils.copyProperties(userForm, user);
-			List<Role> roles = service.getRolesForUserByOrganisation(user, orgId);
-			UserOrgRolesDTO userRoles = new UserOrgRolesDTO();
-			for(int i=0; i<roles.size(); i++) {
-				log.debug("role: "+roles.get(i).getName());
-				if(roles.get(i).getName().equals("LEARNER")) {
-					userRoles.setLearner(true);
-				} else if(roles.get(i).getName().equals("AUTHOR")) {
-					userRoles.setAuthor(true);
-				} else if(roles.get(i).getName().equals("STAFF")) {
-					userRoles.setStaff(true);
-				} else if(roles.get(i).getName().equals("COURSE ADMIN")) {
-					userRoles.setAdmin(true);
-				} else if(roles.get(i).getName().equals("COURSE MANAGER")) {
-					userRoles.setManager(true);
-				}
+			
+			// get system's roles
+			List allRoles = service.findAll(Role.class);
+			ArrayList<RoleDTO> rolelist = new ArrayList<RoleDTO>();
+			for(int i=0; i<allRoles.size(); i++){
+				Role r = (Role)allRoles.get(i);
+			    rolelist.add(new RoleDTO(r));
 			}
-			request.setAttribute("userRoles",userRoles);
+			Collections.sort(rolelist);
+			request.setAttribute("rolelist",rolelist);
+			
+			// get user's roles
+			Iterator iter = user.getUserOrganisations().iterator();
+			while(iter.hasNext()){
+			    UserOrganisation uo = (UserOrganisation)iter.next();
+			    if(uo.getOrganisation().getOrganisationId().equals(orgId)){
+			        Iterator iter2 = uo.getUserOrganisationRoles().iterator();
+			        String[] roles = new String[uo.getUserOrganisationRoles().size()];
+			        int i=0;
+			        while(iter2.hasNext()){
+			            UserOrganisationRole uor = (UserOrganisationRole)iter2.next();
+			            roles[i]=uor.getRole().getRoleId().toString();
+			            log.debug("got roleid: "+roles[i]);
+			            i++;
+			        }
+			        userForm.set("roles",roles);
+			        break;
+			    }
+			}
+			
 		}
 		
 		request.setAttribute("countries",countries);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java,v
diff -u -r1.3 -r1.4
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	19 Jun 2006 05:38:52 -0000	1.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	22 Jun 2006 05:41:36 -0000	1.4
@@ -26,6 +26,9 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.Iterator;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -107,49 +110,67 @@
 				user = (User)service.findById(User.class,userId);
 				BeanUtils.copyProperties(user,userForm);
 				service.save(user);
-				UserOrganisation userOrganisation = service.getUserOrganisation(userId, orgId);
-				List<Role> roles = service.getRolesForUserByOrganisation(user, orgId);
-                
-				Role currentRole = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0);
-				if(userForm.get("learner").equals("on") && roles.indexOf(currentRole)<0) {
-					UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, 
-							currentRole);
-					service.save(userOrganisationRole);
-				} else if(userForm.get("learner").equals("off")){
-					//service.deleteUserOrganisationRole();
+				
+				String[] roles = (String[])userForm.get("roles");
+				List rolesList = Arrays.asList(roles);
+				log.debug("rolesList.size: "+rolesList.size());
+				Set uos = user.getUserOrganisations();
+				Iterator iter = uos.iterator();
+				while(iter.hasNext()){
+				    UserOrganisation uo = (UserOrganisation)iter.next();
+				    if(uo.getOrganisation().getOrganisationId().equals(orgId)){
+				    	// simply clearing the uors and setting new ones specified by user doesn't seem to work
+				        /*uo.getUserOrganisationRoles().clear();
+				        service.save(user);
+				        log.debug("num roles: "+uo.getUserOrganisationRoles().size());
+				        for(int i=0; i<roles.length; i++){    // add new roles set by user
+				        	Integer roleId = Integer.valueOf(roles[i]);
+				        	Role currentRole = (Role)service.findById(Role.class,roleId);
+				        	log.debug("setting role: "+currentRole);
+				        	uo.getUserOrganisationRoles().add(new UserOrganisationRole(uo,currentRole));
+				        	log.debug("num roles: "+uo.getUserOrganisationRoles().size());
+				        }*/
+                        // so we do two double loops to add/remove roles :(
+				    	Set uors = uo.getUserOrganisationRoles();
+				        for(int i=0; i<roles.length; i++){    // add new roles set by user
+				        	Integer roleId = Integer.valueOf(roles[i]);
+				        	Boolean alreadyHasRole = false;
+				        	Iterator iter2 = uors.iterator();
+				        	while(iter2.hasNext()){
+				        		UserOrganisationRole uor = (UserOrganisationRole)iter2.next();
+				        		if(uor.getRole().getRoleId().equals(roleId)){
+				        			alreadyHasRole = true;
+				        			break;  // already found uor that matches this role
+				        		}
+				        	}
+				        	if(!alreadyHasRole){    // add new role
+				        		Role currentRole = (Role)service.findById(Role.class,roleId);
+					            log.debug("setting role: "+currentRole);
+					            uors.add(new UserOrganisationRole(uo,currentRole));
+					            //log.debug("num roles: "+uo.getUserOrganisationRoles().size());
+				        	}
+				        }
+				        Iterator iter3 = uors.iterator();
+				        while(iter3.hasNext()){
+				        	UserOrganisationRole uor = (UserOrganisationRole)iter3.next();
+				        	Integer currentRoleId = uor.getRole().getRoleId();
+				        	//log.debug("currentRoleId: "+currentRoleId.toString());
+				        	//log.debug("rolesList: "+rolesList);
+				        	if(rolesList.indexOf(currentRoleId.toString())<0){    // remove roles not set by user
+				        		log.debug("removing role: "+currentRoleId);
+				        		uors.remove(uor);
+				        		//log.debug("num roles: "+uors.size());
+				        		uo.setUserOrganisationRoles(uors);
+				        		uos.add(uo);
+				        		user.setUserOrganisations(uos);
+				        		break;
+				        	}
+				        }
+				        break;  // already found uo that matches this org
+				    }
 				}
-				currentRole = (Role)service.findByProperty(Role.class,"name","AUTHOR").get(0);
-				if(userForm.get("author").equals("on") && roles.indexOf(currentRole)<0) {
-					UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, 
-							currentRole);
-					service.save(userOrganisationRole);
-				} else if(userForm.get("learner").equals("off")) {
-					//service.deleteUserOrganisationRole();
-				}
-				currentRole = (Role)service.findByProperty(Role.class,"name","STAFF").get(0);
-				if(userForm.get("staff").equals("on") && roles.indexOf(currentRole)<0) {
-					UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, 
-							currentRole);
-					service.save(userOrganisationRole);
-				} else if(userForm.get("learner").equals("off")) {
-					//service.deleteUserOrganisationRole();
-				}
-				currentRole = (Role)service.findByProperty(Role.class,"name","COURSE ADMIN").get(0);
-				if(userForm.get("admin").equals("on") && roles.indexOf(currentRole)<0) {
-					UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, 
-							currentRole);
-					service.save(userOrganisationRole);
-				} else if(userForm.get("learner").equals("off")) {
-					//service.deleteUserOrganisationRole();
-				}
-				currentRole = (Role)service.findByProperty(Role.class,"name","COURSE MANAGER").get(0);
-				if(userForm.get("manager").equals("on") && roles.indexOf(currentRole)<0) {
-					UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, 
-							currentRole);
-					service.save(userOrganisationRole);
-				} else if(userForm.get("learner").equals("off")) {
-					//service.deleteUserOrganisationRole();
-				}
+				service.save(user);
+
 			}else{    // create user
 				log.debug("creating user...");
 				user = new User();
Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.2 -r1.3
--- lams_admin/web/user.jsp	20 Jun 2006 04:57:29 -0000	1.2
+++ lams_admin/web/user.jsp	22 Jun 2006 05:41:36 -0000	1.3
@@ -109,11 +109,10 @@
 	    <tr>
 	        <td><fmt:message key="admin.user.roles"/>:</td>
 	        <td>
-                <input type="checkbox" name="learner" <c:if test="${userRoles.learner}">checked</c:if> /><fmt:message key="admin.user.learner" /><br />
-                <input type="checkbox" name="author" <c:if test="${userRoles.author}">checked</c:if> /><fmt:message key="admin.user.author" /><br />
-                <input type="checkbox" name="staff" <c:if test="${userRoles.staff}">checked</c:if> /><fmt:message key="admin.user.staff" /><br />
-                <input type="checkbox" name="admin" <c:if test="${userRoles.admin}">checked</c:if> /><fmt:message key="admin.user.admin" /><br />
-                <input type="checkbox" name="manager" <c:if test="${userRoles.manager}">checked</c:if> /><fmt:message key="admin.user.manager" />
+                <logic:iterate id="role" name="rolelist">
+                    <html-el:multibox property="roles" value="${role.roleId}"/>
+                    <c:out value="${role.name}"/><br/>
+                </logic:iterate>
 	        </td>
 	    </tr>
 	</logic:notEmpty>