Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgListDTO.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgListDTO.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgListDTO.java (revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
@@ -0,0 +1,82 @@
+/****************************************************************
+ * 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.List;
+
+/**
+ * @version
+ *
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ *
+ * Created at 20:56:24 on 2006-6-5
+ */
+
+public class OrgListDTO {
+
+ private static final long serialVersionUID = -3960695533993640297L;
+
+ private List orgManageBeans;
+
+ private Integer type;
+
+ private Integer parentId;
+
+ private String parentName;
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public List getOrgManageBeans() {
+ return orgManageBeans;
+ }
+
+ public void setOrgManageBeans(List orgManageBeans) {
+ this.orgManageBeans = orgManageBeans;
+ }
+
+ public Integer getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Integer parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getParentName() {
+ return parentName;
+ }
+
+ public void setParentName(String parentName) {
+ this.parentName = parentName;
+ }
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u -rf58d5e2c6d44c733471cadd9f86711553e5beaf5 -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java (.../OrgManageAction.java) (revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java (.../OrgManageAction.java) (revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
@@ -36,6 +36,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
import org.lamsfoundation.lams.usermanagement.UserOrganisation;
import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -60,9 +61,6 @@
* struts doclets
*
* @struts:action path="/orgmanage"
- * name="OrgManageForm"
- * scope="request"
- * validate="false"
*
* @struts:action-forward name="orglist"
* path=".orglist"
@@ -80,33 +78,62 @@
Integer orgId = WebUtil.readIntParam(request,"org");
String username = request.getRemoteUser();
- List userOrganisations = service.getUserOrganisationsForUser(service.getUserByLogin(username));
- OrgManageActionForm orgManageForm = new OrgManageActionForm();
- List orgManageBeans = new ArrayList();
- if(userOrganisations!=null){
- for(int i=0; i orgManageBeans = new ArrayList();
+ if(service.isUserSysAdmin(username)){
+ Integer type;
+ if(orgManageForm.getType().equals(OrganisationType.ROOT_TYPE)){
+ type = OrganisationType.COURSE_TYPE;
+ }else{
+ type = OrganisationType.CLASS_TYPE;
+ }
+ List organisations = service.getOrganisationsByType(type);
+ log.debug("user is sysadmin");
+ log.debug("Got "+organisations.size()+" organsiations");
+ log.debug("organisationType is "+type);
+ for(int i=0; i
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ *
+ * Created at 22:55:01 on 2006-6-6
+ */
+public class OrgManageBean {
+
+ /**
+ * OrgManageBean Constructor
+ *
+ * @param
+ */
+ public OrgManageBean() {
+ super();
+
+ }
+ 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;
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java
===================================================================
diff -u -rf58d5e2c6d44c733471cadd9f86711553e5beaf5 -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java (.../ScheduledJobListAction.java) (revision f58d5e2c6d44c733471cadd9f86711553e5beaf5)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java (.../ScheduledJobListAction.java) (revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
@@ -46,7 +46,7 @@
* @author Steve.Ni
* @version $Revision$
*
- * @struts:action path="/jobList"
+ * @struts:action path="/joblist"
* input=".joblist"
*
* @struts:action-forward name="list" path=".joblist"
Fisheye: Tag 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96 refers to a dead (removed) revision in file `lams_admin/web/adminHeader.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_admin/web/cache.jsp
===================================================================
diff -u -rd25b338aba71bb27bc7b78731f4e88a7c4109447 -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96
--- lams_admin/web/cache.jsp (.../cache.jsp) (revision d25b338aba71bb27bc7b78731f4e88a7c4109447)
+++ lams_admin/web/cache.jsp (.../cache.jsp) (revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
@@ -1,3 +1,9 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+
Index: lams_admin/web/joblist.jsp
===================================================================
diff -u -rd25b338aba71bb27bc7b78731f4e88a7c4109447 -r63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96
--- lams_admin/web/joblist.jsp (.../joblist.jsp) (revision d25b338aba71bb27bc7b78731f4e88a7c4109447)
+++ lams_admin/web/joblist.jsp (.../joblist.jsp) (revision 63fe6fbe11cc88bbcb8c3e87d4cb14025ef0ec96)
@@ -1,3 +1,9 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+