Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -rbcf1660d73964c8178a0ebf5808fd0edc0d55841
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision bcf1660d73964c8178a0ebf5808fd0edc0d55841)
@@ -61,6 +61,7 @@
  * struts doclets
  * 
  * @struts:action path="/orgmanage"
+ *                validate="false"
  *                
  * @struts:action-forward name="orglist"
  *                        path=".orglist"
@@ -76,7 +77,10 @@
             HttpServletRequest request,
             HttpServletResponse response) throws Exception{
 		
-		Integer orgId = WebUtil.readIntParam(request,"org");
+		Integer orgId = WebUtil.readIntParam(request,"org",true);
+		if(orgId==null){
+			orgId = (Integer)request.getAttribute("org");
+		}
 		String username = request.getRemoteUser();
 		OrgListDTO orgManageForm = new OrgListDTO();
 		Organisation org = service.getOrganisationById(orgId);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java	(revision bcf1660d73964c8178a0ebf5808fd0edc0d55841)
@@ -0,0 +1,70 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+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.validator.DynaValidatorForm;
+
+/**
+ * @version
+ *
+ * <p>
+ * <a href="OrgSaveAction.java.html"><i>View Source</i></a>
+ * </p>
+ *
+ * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ *
+ * Created at 16:42:53 on 2006-6-7
+ */
+
+/**
+ * struts doclets
+ * 
+ * @struts:action path="/orgsave"
+ *                name="OrganisationForm"
+ *                input=".organisation"
+ *                scope="request"
+ *                validate="true"
+ *                
+ * @struts:action-forward name="orglist"
+ *                        path="orgmanage.do"
+ */
+
+public class OrgSaveAction extends Action {
+	
+	public ActionForward execute(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception{
+		//TODO save the organisation
+		DynaValidatorForm orgForm = (DynaValidatorForm)form;
+		request.setAttribute("org",orgForm.get("parentId"));
+		return mapping.findForward("orglist");
+	}
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -rf58d5e2c6d44c733471cadd9f86711553e5beaf5 -rbcf1660d73964c8178a0ebf5808fd0edc0d55841
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision bcf1660d73964c8178a0ebf5808fd0edc0d55841)
@@ -37,7 +37,8 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.validator.DynaValidatorForm;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.HttpSessionManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -46,50 +47,42 @@
  * @author Fei Yang
  *
  * @struts:action path="/organisation"
- *  			name="OrganisationForm"
- * 				input=".organisation"
- * 				scope="request"  
- * 				validate="true"
+ *              name="OrganisationForm"
+ *              scope="request"
+ *              parameter="method"
+ * 				validate="false"
  * 
- * @struts:action-forward name="orglist" path=".orglist"
+ * @struts:action-forward name="organisation" path=".organisation"
+ * @struts:action-forward name="orglist" path="orgmanage.do"
  */
-public class OrganisationAction extends Action {
+public class OrganisationAction extends LamsDispatchAction {
 
 	private static Logger log = Logger.getLogger(OrganisationAction.class);
 
 	private static WebApplicationContext ctx = WebApplicationContextUtils
 			.getWebApplicationContext(HttpSessionManager.getInstance()
 					.getServletContext());
 
-	private static UserManagementService service = (UserManagementService) ctx
+	private static IUserManagementService service = (IUserManagementService) ctx
 			.getBean("userManagementServiceTarget");
 
-	/**
-	 * Perform is called when the OrganisationActionForm is processed.
-	 * 
-	 * @param mapping The ActionMapping used to select this instance
-	 * @param actionForm The optional ActionForm bean for this request (if any)
-	 * @param request The HTTP request we are processing
-	 * @param response The HTTP response we are creating
-	 *
-	 * @exception IOException if an input/output error occurs
-	 * @exception ServletException if a servlet exception occurs
-	 */
-	public ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
+	public ActionForward edit(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception{
+		if(request.getAttribute("orgId")!=null){
+			Organisation org = service.getOrganisationById((Integer)request.getAttribute("orgId"));
+			DynaValidatorForm orgForm = (DynaValidatorForm)form;
+			orgForm.set("parentId",org.getParentOrganisation().getOrganisationId());
+			//orgForm.set("name",org.getName());
+			//orgForm.set("code",org.getCode());
+			//orgForm.set("description",org.getDescription());
+			BeanUtils.copyProperties(orgForm,org);
+			orgForm.set("typeId",org.getOrganisationType().getOrganisationTypeId());
+		}
+		return mapping.findForward("organisation");
+	}
 
-		log.debug("Form type is " + form.getClass().toString());
-		log.debug("Form is " + form.toString());
+	public ActionForward remove(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response){
+		return mapping.findForward("orglist");
+	}
 
-		DynaValidatorForm orgForm = (DynaValidatorForm) form;
-		Organisation org = new Organisation();
-
-		BeanUtils.copyProperties(org,orgForm);
-		service.saveOrUpdateOrganisation(org);
-		return mapping.findForward("admin");
-
-	} // end ActionForward
-
 } // end Action
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java
===================================================================
diff -u -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 -rbcf1660d73964c8178a0ebf5808fd0edc0d55841
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java	(.../ScheduledJobListAction.java)	(revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java	(.../ScheduledJobListAction.java)	(revision bcf1660d73964c8178a0ebf5808fd0edc0d55841)
@@ -47,7 +47,7 @@
  * @version $Revision$
  * 
  * @struts:action path="/joblist"
- * 				input=".joblist"
+ * 				validate="false"
  * 
  * @struts:action-forward name="list" path=".joblist"
  */