Index: lams_admin/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-actions.xml,v
diff -u -r1.2 -r1.3
--- lams_admin/conf/xdoclet/struts-actions.xml 6 Jun 2006 07:11:07 -0000 1.2
+++ lams_admin/conf/xdoclet/struts-actions.xml 30 Oct 2006 01:40:32 -0000 1.3
@@ -1,4 +1 @@
-
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java 27 Oct 2006 04:51:36 -0000 1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java 30 Oct 2006 01:40:32 -0000 1.2
@@ -63,7 +63,7 @@
HttpServletResponse response) throws Exception {
// check permission
- if(!request.isUserInRole(Role.SYSADMIN)){
+ if(!(request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.AUTHOR_ADMIN))){
request.setAttribute("errorName","ToolContentListAction");
request.setAttribute("errorMessage",AdminServiceProxy.getMessageService(getServlet().getServletContext())
.getMessage("error.authorisation"));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 30 Oct 2006 01:40:32 -0000 1.1
@@ -0,0 +1,87 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id: SysAdminStartAction.java,v 1.1 2006/10/30 01:40:32 jliew Exp $ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.ArrayList;
+
+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.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.dto.LinkBean;
+import org.lamsfoundation.lams.usermanagement.Role;
+
+/**
+ * @author jliew
+ *
+ * @struts.action path="/sysadminstart" validate="false"
+ * @struts.action-forward name="sysadmin" path=".sysadmin"
+ */
+public class SysAdminStartAction extends Action {
+
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ ArrayList links = new ArrayList();
+ if (request.isUserInRole(Role.SYSADMIN)) {
+ LinkBean linkBean = new LinkBean("cache.do", "cache.title");
+ links.add(linkBean);
+ linkBean = new LinkBean("config.do", "sysadmin.config.settings.edit");
+ links.add(linkBean);
+ linkBean = new LinkBean("toolcontentlist.do", "sysadmin.edit.default.tool.content");
+ links.add(linkBean);
+ linkBean = new LinkBean("usersearch.do", "admin.user.find");
+ links.add(linkBean);
+ linkBean = new LinkBean("importexcel.do", "admin.user.import");
+ links.add(linkBean);
+ linkBean = new LinkBean("disabledmanage.do", "admin.list.disabled.users");
+ links.add(linkBean);
+ linkBean = new LinkBean("loginmaintain.do", "sysadmin.maintain.loginpage");
+ links.add(linkBean);
+ linkBean = new LinkBean("serverlist.do", "sysadmin.maintain.external.servers");
+ links.add(linkBean);
+ linkBean = new LinkBean("register.do", "sysadmin.register.server");
+ links.add(linkBean);
+ } else if (request.isUserInRole(Role.AUTHOR_ADMIN)) {
+ LinkBean linkBean = new LinkBean("toolcontentlist.do", "sysadmin.edit.default.tool.content");
+ links.add(linkBean);
+ } else {
+ request.setAttribute("errorName", "SysAdminStartAction");
+ request.setAttribute("errorMessage", AdminServiceProxy
+ .getMessageService(getServlet().getServletContext())
+ .getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ request.setAttribute("links", links);
+ return mapping.findForward("sysadmin");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/LinkBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/LinkBean.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/LinkBean.java 30 Oct 2006 01:40:32 -0000 1.1
@@ -0,0 +1,51 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id: LinkBean.java,v 1.1 2006/10/30 01:40:32 jliew Exp $ */
+package org.lamsfoundation.lams.admin.web.dto;
+
+public class LinkBean {
+
+ private String link;
+ private String name;
+
+ public LinkBean(String link, String name) {
+ this.link = link;
+ this.name = name;
+ }
+
+ public String getLink() {
+ return link;
+ }
+
+ public void setLink(String link) {
+ this.link = link;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
Index: lams_admin/web/sysadmin.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin.jsp,v
diff -u -r1.15 -r1.16
--- lams_admin/web/sysadmin.jsp 27 Oct 2006 04:51:34 -0000 1.15
+++ lams_admin/web/sysadmin.jsp 30 Oct 2006 01:40:32 -0000 1.16
@@ -2,23 +2,13 @@
-
-
+
+
+ ">
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-