Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bfe9a3f1fab72deab8749ecce2f49ece2cee2db3 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/CacheAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag bfe9a3f1fab72deab8749ecce2f49ece2cee2db3 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/CacheActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
@@ -0,0 +1,116 @@
+/****************************************************************
+ * 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 java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+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.lamsfoundation.lams.usermanagement.Organisation;
+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.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @version
+ *
+ * <p>
+ * <a href="OrgManageAction.java.html"><i>View Source</i></a>
+ * </p>
+ *
+ * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ *
+ * Created at 20:29:13 on 2006-6-5
+ */
+
+/**
+ * struts doclets
+ * 
+ * @struts:action path="/orgmanage"
+ *                name="OrgManageForm"
+ *                scope="request"
+ *                validate="false"
+ *                
+ * @struts:action-forward name="orglist"
+ *                        path=".orglist"
+ */
+public class OrgManageAction extends Action {
+	
+	private static final Logger log = Logger.getLogger(OrgManageAction.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{
+		
+		Integer orgId = WebUtil.readIntParam(request,"org");
+		String username = request.getRemoteUser();
+		List userOrganisations = service.getUserOrganisationsForUser(service.getUserByLogin(username));
+		OrgManageActionForm orgManageForm = new OrgManageActionForm();
+		List<OrgManageActionForm.OrgManageBean> orgManageBeans = new ArrayList<OrgManageActionForm.OrgManageBean>();
+		if(userOrganisations!=null){
+			for(int i=0; i<userOrganisations.size(); i++){
+				OrgManageActionForm.OrgManageBean orgManageBean = new OrgManageActionForm.OrgManageBean();
+				orgManageBean.setEditable(false);
+				UserOrganisation userOrganisation = (UserOrganisation)userOrganisations.get(i);
+				Organisation organisation = userOrganisation.getOrganisation();
+				if(organisation.getParentOrganisation().getOrganisationId().equals(orgId)){
+					BeanUtils.copyProperties(orgManageBean,organisation);
+					orgManageBean.setStatus(organisation.getOrganisationState().getDescription());
+					Iterator iter = userOrganisation.getUserOrganisationRoles().iterator();
+					while(iter.hasNext()){
+						UserOrganisationRole userOrganisationRole = (UserOrganisationRole)iter.next();
+						if(userOrganisationRole.getRole().isSysAdmin()||userOrganisationRole.getRole().isCourseManager()||userOrganisationRole.getRole().isCourseAdmin()){
+							orgManageBean.setEditable(true);
+							break;
+						}
+					}
+					orgManageBeans.add(orgManageBean);
+				}
+			}
+			UserOrganisation userOrganisation = (UserOrganisation)userOrganisations.get(0);
+			Organisation organisation = userOrganisation.getOrganisation();
+			orgManageForm.setType(organisation.getOrganisationType().getOrganisationTypeId());
+			orgManageForm.setParentOrganisation(organisation.getParentOrganisation());
+		}
+		orgManageForm.setOrgManageBeans(orgManageBeans);
+		request.setAttribute("OrgManageForm",orgManageForm);
+		return mapping.findForward("orglist");
+	}
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageActionForm.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageActionForm.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageActionForm.java	(revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
@@ -0,0 +1,144 @@
+/****************************************************************
+ * 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 java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.struts.action.ActionForm;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+
+/**
+ * @version
+ *
+ * <p>
+ * <a href="OrgManageActionForm.java.html"><i>View Source</i></a>
+ * </p>
+ *
+ * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ *
+ * Created at 20:56:24 on 2006-6-5
+ */
+public class OrgManageActionForm extends ActionForm {
+
+	private static final long serialVersionUID = -3960695533993640297L;
+
+	static class OrgManageBean {
+	    private Integer organisationId;
+	    private String name;
+	    private String code;
+	    private String description;
+	    private Date createDate;
+	    private boolean editable;
+	    private String status;
+		private String localeLanguage;
+		private String localeCountry;
+		
+		public String getCode() {
+			return code;
+		}
+		public void setCode(String code) {
+			this.code = code;
+		}
+		public Date getCreateDate() {
+			return createDate;
+		}
+		public void setCreateDate(Date createDate) {
+			this.createDate = createDate;
+		}
+		public String getDescription() {
+			return description;
+		}
+		public void setDescription(String description) {
+			this.description = description;
+		}
+		public String getLocaleCountry() {
+			return localeCountry;
+		}
+		public void setLocaleCountry(String localeCountry) {
+			this.localeCountry = localeCountry;
+		}
+		public String getLocaleLanguage() {
+			return localeLanguage;
+		}
+		public void setLocaleLanguage(String localeLanguage) {
+			this.localeLanguage = localeLanguage;
+		}
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		public Integer getOrganisationId() {
+			return organisationId;
+		}
+		public void setOrganisationId(Integer organisationId) {
+			this.organisationId = organisationId;
+		}
+		public String getStatus() {
+			return status;
+		}
+		public void setStatus(String status) {
+			this.status = status;
+		}
+		public boolean isEditable() {
+			return editable;
+		}
+		public void setEditable(boolean editable) {
+			this.editable = editable;
+		}
+	}
+	
+	private List<OrgManageBean> orgManageBeans;
+	
+	private Integer type;
+	
+	private Organisation parentOrganisation;
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public List<OrgManageBean> getOrgManageBeans() {
+		return orgManageBeans;
+	}
+
+	public void setOrgManageBeans(List<OrgManageBean> orgManageBeans) {
+		this.orgManageBeans = orgManageBeans;
+	}
+
+	public Organisation getParentOrganisation() {
+		return parentOrganisation;
+	}
+
+	public void setParentOrganisation(Organisation parentOrganisation) {
+		this.parentOrganisation = parentOrganisation;
+	}
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -rf58d5e2c6d44c733471cadd9f86711553e5beaf5
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
@@ -24,27 +24,19 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
 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.lamsfoundation.lams.admin.util.AdminPreparer;
+import org.apache.struts.validator.DynaValidatorForm;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.OrganisationType;
-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.UserManagementService;
 import org.lamsfoundation.lams.web.util.HttpSessionManager;
 import org.springframework.web.context.WebApplicationContext;
@@ -53,115 +45,51 @@
 /**
  * @author Fei Yang
  *
- * @struts:action path="/admin/organisation"
- *  			name="OrganisationActionForm"
- * 				input=".admin.organisation"
- * 				scope="session"  
+ * @struts:action path="/organisation"
+ *  			name="OrganisationForm"
+ * 				input=".organisation"
+ * 				scope="request"  
  * 				validate="true"
  * 
- * @struts:action-forward name="admin" path=".admin"
- * @struts:action-forward name="error" path=".admin.error"
+ * @struts:action-forward name="orglist" path=".orglist"
  */
 public class OrganisationAction extends Action {
 
 	private static Logger log = Logger.getLogger(OrganisationAction.class);
-	private static WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager.getInstance().getServletContext());
-	private static UserManagementService service = (UserManagementService) 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
-  	{
 
-        ActionErrors errors = new ActionErrors();
-		log.debug("Form type is "+form.getClass().toString());
-		log.debug("Form is "+form.toString());
+	private static WebApplicationContext ctx = WebApplicationContextUtils
+			.getWebApplicationContext(HttpSessionManager.getInstance()
+					.getServletContext());
 
-		OrganisationActionForm orgForm = (OrganisationActionForm) form;
-    	Organisation org = null;
-		
-       // -- isCancelled?
-        if (isCancelled(request)) {
-        	if(orgForm.getOrgId().intValue()!=-1){
-        		org=service.getOrganisationById(orgForm.getOrgId());
-        	}else{
-        		org=service.getOrganisationById(orgForm.getParentOrgId());
-        	}
-        	AdminPreparer.prepare(org,request,service);	
-        	request.getSession(true).removeAttribute(OrganisationActionForm.formName);
-			return mapping.findForward("admin");
-        }
+	private static UserManagementService service = (UserManagementService) ctx
+			.getBean("userManagementServiceTarget");
 
-        if (errors.isEmpty()) 
-        {
-        	log.debug("Call update organisation, based on form data "+orgForm);
-        	
-        	try {
-	        	if(orgForm.getOrgId().intValue()!=-1){//edit organisation
-	        		org = service.getOrganisationById(orgForm.getOrgId());
-	        		org.setName(orgForm.getName());
-	        		org.setDescription(orgForm.getDescription());
-	        		service.saveOrUpdateOrganisation(org);
-	        	}else{//create child organisation
-	        		org = new Organisation();
-	        		org.setName(orgForm.getName());
-	        		org.setDescription(orgForm.getDescription());
-	        		Organisation parentOrg = service.getOrganisationById(orgForm.getParentOrgId());
-	        		org.setParentOrganisation(parentOrg);
-	        		org.setCreateDate(new Date());
-	        		OrganisationType orgType;
-	        		if(parentOrg.getOrganisationType().getName().equals(OrganisationType.ROOT_DESCRIPTION)){
-	        			orgType = service.getOrganisationTypeByName(OrganisationType.COURSE_DESCRIPTION);
-	        		}else{
-	        			orgType = service.getOrganisationTypeByName(OrganisationType.CLASS_DESCRIPTION);
-	        		}
-	        		org.setOrganisationType(orgType);
-	        		service.saveOrUpdateOrganisation(org);
-	        		UserOrganisation userOrg = new UserOrganisation();
-	        		User user = service.getUserByLogin(request.getRemoteUser());
-	        		userOrg.setUser(user);
-	        		userOrg.setOrganisation(org);
-	        		service.saveOrUpdateUserOrganisation(userOrg);
-	        		UserOrganisationRole userOrgRole = new UserOrganisationRole();
-	        		userOrgRole.setUserOrganisation(userOrg);
-	        		userOrgRole.setRole(service.getRoleByName(Role.ADMIN));
-	        		service.saveOrUpdateUserOrganisationRole(userOrgRole);
-	        	}
-				AdminPreparer.prepare(org,request,service);
-			} catch (Exception e) {
-				log.error("Exception happened when getOrganisationEdit",e);
-				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(e.getMessage()));				
-			}
-			
-        } 
+	/**
+	 * 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 {
 
-        // -- Report any errors
-        if (!errors.isEmpty()) {
-            addErrors(request, errors);
-            if (mapping.getInput()!=null)
-                return (new ActionForward(mapping.getInput()));
-            // If no input page, use error forwarding
-            return (mapping.findForward("error"));
-        }else{
-        	return mapping.findForward("admin");
-        }
+		log.debug("Form type is " + form.getClass().toString());
+		log.debug("Form is " + form.toString());
 
+		DynaValidatorForm orgForm = (DynaValidatorForm) form;
+		Organisation org = new Organisation();
 
-    } // end ActionForward
+		BeanUtils.copyProperties(org,orgForm);
+		service.saveOrUpdateOrganisation(org);
+		return mapping.findForward("admin");
 
+	} // end ActionForward
 
 } // end Action
 
-
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java
===================================================================
diff -u -rde1940e60766f8901436c6ab567c692685d5b35c -rf58d5e2c6d44c733471cadd9f86711553e5beaf5
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java	(.../ScheduledJobListAction.java)	(revision de1940e60766f8901436c6ab567c692685d5b35c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java	(.../ScheduledJobListAction.java)	(revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
@@ -47,9 +47,9 @@
  * @version $Revision$
  * 
  * @struts:action path="/jobList"
- * 				input=".admin.joblist"
+ * 				input=".joblist"
  * 
- * @struts:action-forward name="list" path=".admin.joblist"
+ * @struts:action-forward name="list" path=".joblist"
  */
 public class ScheduledJobListAction extends Action{
 
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f58d5e2c6d44c733471cadd9f86711553e5beaf5 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?