Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r8cfa07901cb6337b5483aa035ab100a1d166d37d -r40cd00471f7910f9cc2459a03082d35b33fd8308
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 8cfa07901cb6337b5483aa035ab100a1d166d37d)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 40cd00471f7910f9cc2459a03082d35b33fd8308)
@@ -34,3 +34,9 @@
 	<form-property name="localeCountry" type="java.lang.String" />
     <form-property name="roles" type="java.lang.String[]" />
 </form-bean>
+
+<form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
+    <form-property name="orgId" type="java.lang.Integer" />
+    <form-property name="orgName" type="java.lang.String" />
+    <form-property name="userIds" type="java.lang.String[]" />
+</form-bean>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(revision 40cd00471f7910f9cc2459a03082d35b33fd8308)
@@ -0,0 +1,136 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.admin.web;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ */
+
+/**
+ * struts doclets
+ * 
+ * @struts:action path="/userorg"
+ *                name="UserOrgForm"
+ *                scope="request"
+ *                validate="false"
+ *
+ * @struts:action-forward name="userorg"
+ *                        path=".userorg"
+ */
+public class UserOrgAction extends Action {
+	
+	private static final Logger log = Logger.getLogger(UserOrgAction.class);
+	private static WebApplicationContext ctx = WebApplicationContextUtils
+	    .getWebApplicationContext(HttpSessionManager.getInstance()
+	    		.getServletContext());
+	private static IUserManagementService service = (IUserManagementService)ctx
+	    .getBean("userManagementServiceTarget");
+	
+	public ActionForward execute(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+		
+		ActionMessages errors = new ActionMessages();
+		Integer orgId = WebUtil.readIntParam(request,"orgId",true);
+		log.debug("orgId: "+orgId);
+        // get org name
+		Organisation organisation = (Organisation)service.findById(Organisation.class,orgId);
+
+		if((orgId==null)||(orgId<=0)||organisation==null){
+			errors.add("orgId",new ActionMessage("error.org.invalid"));
+			saveErrors(request,errors);
+			return mapping.findForward("error");
+		}
+		
+		String orgName = organisation.getName();
+		log.debug("orgName: "+orgName);
+		Organisation parentOrg = organisation.getParentOrganisation();
+		
+		// check user permission
+		//String username = request.getRemoteUser();
+		
+		// get list of users in org
+		List<User> users = service.getUsersFromOrganisation(parentOrg.getOrganisationId());
+		request.setAttribute("userlist",users);
+		/*if(users==null){
+			errors.add("org",new ActionMessage("error.org.invalid"));
+			saveErrors(request,errors);
+			return mapping.findForward("error");
+		}*/
+		
+		// create form object
+		//UserListDTO userListForm = new UserListDTO();
+		DynaActionForm userOrgForm = (DynaActionForm)form;
+		userOrgForm.set("orgId",orgId);
+		userOrgForm.set("orgName",orgName);
+		//userOrgForm.set("userlist",users);
+		/*userListForm.setOrgId(orgId);
+		userListForm.setOrgName(orgName);
+		List<UserManageBean> userManageBeans = new ArrayList<UserManageBean>();
+		for(int i=0; i<users.size(); i++) {
+			User user = (User)users.get(i);
+			UserManageBean userManageBean = new UserManageBean();
+			BeanUtils.copyProperties(userManageBean, user);
+			userManageBeans.add(userManageBean);
+		}
+		
+		userListForm.setUserManageBeans(userManageBeans);
+		request.setAttribute("UserListForm", userListForm);*/
+		
+		// create list of userids, members of this org
+		List<User> memberUsers = service.getUsersFromOrganisation(orgId);
+		String[] userIds = new String[memberUsers.size()];
+		for(int i=0; i<userIds.length; i++){
+			userIds[i] = memberUsers.get(i).getUserId().toString();
+		}
+		userOrgForm.set("userIds",userIds);
+
+		return mapping.findForward("userorg");
+	}
+	
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	(revision 40cd00471f7910f9cc2459a03082d35b33fd8308)
@@ -0,0 +1,152 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.admin.web;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ * Created at 17:22:21 on 20/06/2006
+ */
+
+/**
+ * struts doclets
+ * 
+ * @struts:action path="/userorgsave"
+ *                name="UserOrgForm"
+ *                input=".userorg"
+ *                scope="request"
+ *                validate="false"
+ *
+ * @struts:action-forward name="userlist"
+ *                        path="/usermanage.do"
+ */
+public class UserOrgSaveAction extends Action{
+
+	private static Logger log = Logger.getLogger(UserOrgSaveAction.class);
+	private static WebApplicationContext ctx = WebApplicationContextUtils
+			.getWebApplicationContext(HttpSessionManager.getInstance()
+					.getServletContext());
+	private static IUserManagementService service = (IUserManagementService) ctx
+			.getBean("userManagementServiceTarget");
+	
+	public ActionForward execute(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+		DynaActionForm userOrgForm = (DynaActionForm)form;
+		log.debug("orgId: "+userOrgForm.get("orgId"));
+				
+		Integer orgId = (Integer)userOrgForm.get("orgId");
+		request.setAttribute("org",orgId);
+		
+		if(isCancelled(request)){
+			return mapping.findForward("userlist");
+		}
+		
+		Organisation organisation = (Organisation)service.findById(Organisation.class, orgId);
+		Set uos = organisation.getUserOrganisations();
+		
+		/* clear and repopulate set of userorganisations;
+		 * adding new rows work, but old ones are not removed:
+		 * ObjectDeletedException, object would be re-saved by cascade
+		uos.clear();
+		organisation.setUserOrganisations(uos);
+		service.save(organisation);
+		
+		String[] userIds = (String[])userOrgForm.get("userIds");
+		List userIdList = Arrays.asList(userIds);
+		for(int i=0; i<userIdList.size(); i++){
+			Integer userId = new Integer((String)userIdList.get(i));
+			User user = (User)service.findById(User.class,userId);
+			UserOrganisation uo = new UserOrganisation(user,organisation);
+			uos.add(uo);
+			log.debug("adding userId: "+userId);
+		}
+		organisation.setUserOrganisations(uos);
+		service.save(organisation);
+		*/
+		
+		String[] userIds = (String[])userOrgForm.get("userIds");
+		List<String> userIdList = Arrays.asList(userIds);
+		log.debug("userIdList: "+userIdList);
+		
+		// remove UserOrganisations that aren't in form data
+		Iterator iter = uos.iterator();
+		while(iter.hasNext()){
+			UserOrganisation uo = (UserOrganisation)iter.next();
+			Integer userId = uo.getUser().getUserId();
+			if(userIdList.indexOf(userId.toString())<0){
+				iter.remove();
+				log.debug("removed: "+userId);
+			}
+		}
+		// add UserOrganisations that are in form data
+		for(int i=0; i<userIdList.size(); i++){
+			Integer userId = new Integer((String)userIdList.get(i));
+			Iterator iter2 = uos.iterator();
+			Boolean alreadyInOrg = false;
+			while(iter2.hasNext()){
+				UserOrganisation uo = (UserOrganisation)iter2.next();
+				if(uo.getUser().getUserId().equals(userId)){
+					alreadyInOrg = true;
+					break;
+				}
+			}
+			if(!alreadyInOrg){
+				User user = (User)service.findById(User.class,userId);
+				UserOrganisation uo = new UserOrganisation(user,organisation);
+				uos.add(uo);
+				log.debug("added: "+userId);
+			}
+		}
+		
+		organisation.setUserOrganisations(uos);
+		service.save(organisation);
+		
+		return mapping.findForward("userlist");
+	}
+}
Index: lams_admin/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -rf6f431f97dc0d3ca790ed01552e9dd168a5854a4 -r40cd00471f7910f9cc2459a03082d35b33fd8308
--- lams_admin/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision f6f431f97dc0d3ca790ed01552e9dd168a5854a4)
+++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 40cd00471f7910f9cc2459a03082d35b33fd8308)
@@ -2,6 +2,14 @@
 
 <tiles-definitions>
 	
+	<definition name=".userorg" path="/template.jsp">
+		<put name="title" value="admin.user.management"/>
+		<put name="pageHeader" value="admin.user.management"/>
+		<put name="header" value="header.jsp"/>
+		<put name="content" value="userorg.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+	
 	<definition name=".userlist" path="/template.jsp">
 		<put name="title" value="admin.user.management"/>
 		<put name="pageHeader" value="admin.user.management"/>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r70ea9388f979616b6b3cfd0b30ea23338f95f83c -r40cd00471f7910f9cc2459a03082d35b33fd8308
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 70ea9388f979616b6b3cfd0b30ea23338f95f83c)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 40cd00471f7910f9cc2459a03082d35b33fd8308)
@@ -9,7 +9,7 @@
 <h4 align="left"><fmt:message key="admin.user.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <bean:write name="UserManageForm" property="orgName"/></h4>
 <p align="right">
 <input type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit&orgId=1' />
-<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='user.do?method=add&orgId=<bean:write name="UserManageForm" property="orgId"/>' /></p>
+<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' /></p>
 <table width=100%>
 <tr>
 	<th></th>
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u
--- lams_admin/web/userorg.jsp	(revision 0)
+++ lams_admin/web/userorg.jsp	(revision 40cd00471f7910f9cc2459a03082d35b33fd8308)
@@ -0,0 +1,58 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-html-el" prefix="html-el" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<html-el:form action="/userorgsave.do" method="post">
+<html-el:hidden property="orgId" />
+<h4 align="left">
+  Add Users to Course/Class: <bean:write name="UserOrgForm" property="orgName"/>
+</h4>
+
+<div align="center"><html-el:errors/></div>
+<table width=100%>
+<tr>
+	<th></th>
+	<th><fmt:message key="admin.user.login"/></th>
+	<th><fmt:message key="admin.user.title"/></th>
+	<th><fmt:message key="admin.user.first_name"/></th>
+	<th><fmt:message key="admin.user.last_name"/></th>
+	<th></th>
+</tr>
+
+<logic:iterate id="user" name="userlist">
+	<tr>
+		<td>
+			<bean:write name="user" property="userId" />
+		</td>
+		<td>
+			<bean:write name="user" property="login" />
+		</td>
+		<td>
+			<bean:write name="user" property="title" />
+		</td>
+		<td>
+			<bean:write name="user" property="firstName" />
+		</td>
+		<td>
+			<bean:write name="user" property="lastName" />
+		</td>
+		<td>
+            <html-el:multibox name="UserOrgForm" property="userIds" value="${user.userId}"/>
+		</td>		
+	</tr>
+</logic:iterate>
+
+<tr>
+	<td colspan=6 align="right">
+		<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
+		<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
+		<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>
+	</td>
+</tr>
+
+</table>
+</html-el:form>
\ No newline at end of file