Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.25 -r1.26 --- lams_admin/conf/language/lams/ApplicationResources.properties 13 Dec 2007 04:11:10 -0000 1.25 +++ lams_admin/conf/language/lams/ApplicationResources.properties 14 Dec 2007 04:18:20 -0000 1.26 @@ -339,4 +339,16 @@ msg.click.add.user = Click a user to add them. msg.show.all.potential.users = Show all potential users. label.next = Next - +label.users.in.system = {0} users in system. +label.users.in.group = {0} users in group. +label.show = Show +label.groups = groups +label.subgroups = subgroups +heading.manage.group.users = Manage Users of {0} +label.learners = Learners +label.monitors = Monitors +label.authors = Authors +label.group.managers = Group Managers +label.group.admins = Group Administrators +label.sysadmins = Sysadmins +label.author.admins = Author Administrators Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.24 -r1.25 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 13 Dec 2007 04:11:10 -0000 1.24 +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 14 Dec 2007 04:18:20 -0000 1.25 @@ -332,11 +332,23 @@ #======= End labels: Exported 321 labels for en AU ===== heading.users = Users -label.number.of.users = users. +label.number.of.users = {0} users. heading.potential.users = Potential Users -label.number.of.potential.users = potential users. +label.number.of.potential.users = {0} potential users. msg.click.remove.user = Click a user to remove them. msg.click.add.user = Click a user to add them. msg.show.all.potential.users = Show all potential users. label.next = Next - +label.users.in.system = {0} users in system. +label.users.in.group = {0} users in group. +label.show = Show +label.groups = groups +label.subgroups = subgroups +heading.manage.group.users = Manage Users of {0} +label.learners = Learners +label.monitors = Monitors +label.authors = Authors +label.group.managers = Group Managers +label.group.admins = Group Administrators +label.sysadmins = Sysadmins +label.author.admins = Author Administrators \ No newline at end of file Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgListDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java,v diff -u -r1.21 -r1.22 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java 7 Dec 2007 01:40:01 -0000 1.21 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java 14 Dec 2007 04:18:20 -0000 1.22 @@ -24,19 +24,21 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; 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.admin.service.AdminServiceProxy; +import org.lamsfoundation.lams.admin.web.form.OrgManageForm; import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -62,19 +64,17 @@ * struts doclets * * @struts:action path="/orgmanage" + * name="OrgManageForm" + * input=".orglist" + * scope="request" * validate="false" * - * @struts:action-forward name="orglist" - * path=".orglist" + * @struts:action-forward name="orglist" path=".orglist" */ public class OrgManageAction extends Action { - private static final Logger log = Logger.getLogger(OrgManageAction.class); - private static IUserManagementService service; - private static MessageService messageService; - public ActionForward execute(ActionMapping mapping, ActionForm form, @@ -84,78 +84,110 @@ service = AdminServiceProxy.getService(getServlet().getServletContext()); messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext()); - // Get organisation whose child organisations we will populate the DTO/orgManageForm with - Integer orgId = WebUtil.readIntParam(request,"org",true); - if(orgId==null){ + // Get organisation whose child organisations we will populate the OrgManageForm with + Integer orgId = WebUtil.readIntParam(request, "org", true); + Organisation org = null; + if (orgId == null){ orgId = (Integer)request.getAttribute("org"); } - if((orgId==null)||(orgId<=0)){ - request.setAttribute("errorName","OrgManageAction"); - request.setAttribute("errorMessage",messageService.getMessage("error.org.invalid")); - return mapping.findForward("error"); + if ((orgId != null) && (orgId > 0)) { + org = (Organisation)service.findById(Organisation.class, orgId); + if (org == null){ + request.setAttribute("errorName", "OrgManageAction"); + request.setAttribute("errorMessage", messageService.getMessage("error.org.invalid")); + return mapping.findForward("error"); + } } - OrgListDTO orgManageForm = new OrgListDTO(); - Organisation org = (Organisation)service.findById(Organisation.class,orgId); - log.debug("orgId:"+orgId); - if(org==null){ - request.setAttribute("errorName","OrgManageAction"); - request.setAttribute("errorMessage",messageService.getMessage("error.org.invalid")); - return mapping.findForward("error"); - }else if(org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)){ - request.setAttribute("errorName","OrgManageAction"); - request.setAttribute("errorMessage",messageService.getMessage("error.orgtype.invalid")); - return mapping.findForward("error"); - } - // Set DTO/orgManageForm + // get number of users figure + // TODO use hql that does a count instead of getting whole objects + Integer numUsers = (service.getRootOrganisation().equals(org) + ? service.getCountUsers() + : Integer.valueOf(service.getUsersFromOrganisation(orgId).size()) + ); + String key = (service.getRootOrganisation().getOrganisationId().equals(orgId) + ? "label.users.in.system" + : "label.users.in.group" + ); + String[] args = { numUsers.toString() }; + request.setAttribute("numUsers", messageService.getMessage(key, args)); + + // get logged in user's id + Integer userId = ((UserDTO)SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); + + // Set OrgManageForm + OrgManageForm orgManageForm = (OrgManageForm)form; + if (orgManageForm == null) { + orgManageForm = new OrgManageForm(); + orgManageForm.setStateId(OrganisationState.ACTIVE); + } else if (orgManageForm.getStateId() == null) { + orgManageForm.setStateId(OrganisationState.ACTIVE); + } orgManageForm.setParentId(orgId); orgManageForm.setParentName(org.getName()); orgManageForm.setType(org.getOrganisationType().getOrganisationTypeId()); - log.debug("orgType:"+orgManageForm.getType()); // Get list of child organisations depending on requestor's role and the organisation's type - List orgManageBeans = new ArrayList(); - Integer userId = ((UserDTO)SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); - if(request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER)){ - // the organisation type of the children - Integer type; - if(orgManageForm.getType().equals(OrganisationType.ROOT_TYPE)){ - type = OrganisationType.COURSE_TYPE; - }else{ - type = OrganisationType.CLASS_TYPE; - } - List organisations = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",type); - log.debug("user is an admin or manager"); - log.debug("Got "+organisations.size()+" organisations"); - log.debug("organisationType is "+type); - for(int i=0; i orgManageBeans = new ArrayList(); + if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER)){ + // the organisation type of the children + Integer typeId = (orgManageForm.getType().equals(OrganisationType.ROOT_TYPE) + ? OrganisationType.COURSE_TYPE + : OrganisationType.CLASS_TYPE + ); + + HashMap properties = new HashMap(); + properties.put("organisationType.organisationTypeId", typeId); + properties.put("organisationState.organisationStateId", orgManageForm.getStateId()); + List organisations = service.findByProperties(Organisation.class, properties); + + for (int i=0; i roleCount = new HashMap(); + if (orgId.equals(rootOrgId)) { + roleCount.put(Role.SYSADMIN, Role.ROLE_SYSADMIN); + roleCount.put(Role.AUTHOR_ADMIN, Role.ROLE_AUTHOR_ADMIN); + roleCount.put(Role.GROUP_ADMIN, Role.ROLE_GROUP_ADMIN); + } else { + roleCount.put(Role.LEARNER, Role.ROLE_LEARNER); + roleCount.put(Role.MONITOR, Role.ROLE_MONITOR); + roleCount.put(Role.AUTHOR, Role.ROLE_AUTHOR); + roleCount.put(Role.GROUP_MANAGER, Role.ROLE_GROUP_MANAGER); + roleCount.put(Role.GROUP_ADMIN, Role.ROLE_GROUP_ADMIN); + } + for (String role : roleCount.keySet()) { + Integer count = service.getCountRoleForOrg(orgId, roleCount.get(role)); + request.setAttribute(role.replace(' ', '_'), count); + } + + // count users in the org + // TODO use hql that does a count instead of getting whole objects + Integer numUsers = Integer.valueOf(service.getUsersFromOrganisation(orgId).size()); + args[0] = numUsers.toString(); + request.setAttribute("numUsers", messageService.getMessage("label.users.in.group", args)); + return mapping.findForward("userlist"); } private ActionForward forwardError(ActionMapping mapping, HttpServletRequest request, String key) { request.setAttribute("errorName","UserManageAction"); - if (key.equals("error.org.invalid")) { - request.setAttribute("errorMessage",messageService.getMessage("error.org.invalid")); - } else if (key.equals("error.authorisation")) { - request.setAttribute("errorMessage",messageService.getMessage("error.authorisation")); - } + request.setAttribute("errorMessage",messageService.getMessage(key)); return mapping.findForward("error"); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java 14 Dec 2007 04:18:20 -0000 1.1 @@ -0,0 +1,97 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ +package org.lamsfoundation.lams.admin.web.form; + +import java.util.List; + +import org.apache.struts.action.ActionForm; +import org.lamsfoundation.lams.admin.web.OrgManageBean; + +/** + * @version + * + *

+ * View Source + *

+ * + * @author Fei Yang + * + * Created at 20:56:24 on 2006-6-5 + * + * @struts.form name="OrgManageForm" + */ + +public class OrgManageForm extends ActionForm { + + private static final long serialVersionUID = -3960695533993640297L; + + private List orgManageBeans; + + private Integer type; + + private Integer parentId; + + private String parentName; + + private Integer stateId; + + public Integer getStateId() { + return stateId; + } + + public void setStateId(Integer stateId) { + this.stateId = stateId; + } + + 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/web/cache.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/cache.jsp,v diff -u -r1.9 -r1.10 --- lams_admin/web/cache.jsp 26 Oct 2006 02:32:26 -0000 1.9 +++ lams_admin/web/cache.jsp 14 Dec 2007 04:18:18 -0000 1.10 @@ -1,9 +1,9 @@ <%@ include file="/taglibs.jsp"%> -

- : - -

+

+ +

+


Index: lams_admin/web/cleanup.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/cleanup.jsp,v diff -u -r1.1 -r1.2 --- lams_admin/web/cleanup.jsp 30 Mar 2007 03:41:00 -0000 1.1 +++ lams_admin/web/cleanup.jsp 14 Dec 2007 04:18:18 -0000 1.2 @@ -2,10 +2,8 @@ <%@ page import="org.lamsfoundation.lams.util.FileUtil" %> <%@ page import="org.lamsfoundation.lams.util.TempDirectoryFilter" %> -

- - :

-

 

+

+

Index: lams_admin/web/disabledusers.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/disabledusers.jsp,v diff -u -r1.4 -r1.5 --- lams_admin/web/disabledusers.jsp 9 Nov 2006 05:45:57 -0000 1.4 +++ lams_admin/web/disabledusers.jsp 14 Dec 2007 04:18:18 -0000 1.5 @@ -1,10 +1,8 @@ <%@ include file="/taglibs.jsp"%> -
-

- - :

-

 

+

+

+ @@ -37,4 +35,3 @@
-
\ No newline at end of file Index: lams_admin/web/ldap.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/ldap.jsp,v diff -u -r1.4 -r1.5 --- lams_admin/web/ldap.jsp 15 Oct 2007 07:09:27 -0000 1.4 +++ lams_admin/web/ldap.jsp 14 Dec 2007 04:18:18 -0000 1.5 @@ -11,12 +11,9 @@ } -

- - :

- +

-
+

Index: lams_admin/web/librarylist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/Attic/librarylist.jsp,v diff -u -r1.3 -r1.4 --- lams_admin/web/librarylist.jsp 5 Mar 2007 23:48:02 -0000 1.3 +++ lams_admin/web/librarylist.jsp 14 Dec 2007 04:18:18 -0000 1.4 @@ -1,6 +1,8 @@ <%@ include file="/taglibs.jsp"%> -

:

+

+

+

Index: lams_admin/web/loginmaintain.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/loginmaintain.jsp,v diff -u -r1.10 -r1.11 --- lams_admin/web/loginmaintain.jsp 9 May 2007 01:02:41 -0000 1.10 +++ lams_admin/web/loginmaintain.jsp 14 Dec 2007 04:18:18 -0000 1.11 @@ -2,11 +2,10 @@ <%@ taglib uri="tags-lams" prefix="lams" %> <%@ taglib uri="fck-editor" prefix="fck"%> -

- : - -

-
+

+

+

+
Index: lams_admin/web/organisation.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/Attic/organisation.jsp,v diff -u -r1.18 -r1.19 --- lams_admin/web/organisation.jsp 24 Nov 2006 01:47:30 -0000 1.18 +++ lams_admin/web/organisation.jsp 14 Dec 2007 04:18:18 -0000 1.19 @@ -4,33 +4,32 @@ -

+

- : "> + : "> - : org - usermanage.do?org="> - - - : + : "> +

+ +

+ + + - : + - : + -

+ -

 

-
Index: lams_admin/web/orglist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/Attic/orglist.jsp,v diff -u -r1.24 -r1.25 --- lams_admin/web/orglist.jsp 7 Dec 2007 01:40:01 -0000 1.24 +++ lams_admin/web/orglist.jsp 14 Dec 2007 04:18:18 -0000 1.25 @@ -12,84 +12,186 @@ //--> - -

+

"> -

-

 

-

- - + +

+ + + +
+ + + ' /> + +
+

+
+ + + + + + + ' /> + +
+ + + " /> + + + + + : + + + + +

+ + : "> +

+

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
::
::
::
::
+ +
+ +

+ + ' /> + +

+ +
+ ' /> +
+

+ +
+ - + - ' /> - - - ' /> - -

+ ' /> +
+
+ + " /> + + + + + : + - -

+ + +

+ : "> : "> - : -

-

 

- - - - - -

- ' /> - ' /> - - ' /> - +

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
::
::
::
::
+ +
+ +

+ + ' /> +

+ +
+ ' /> +
+

+ +
+ + +
- - - - - - - - - - - - + - - - - - - + + + + - - + + + + + + + + + + +
Id
- - - - - - - - - - - - - - - Id
+ + + + + +
@@ -104,9 +206,12 @@ - - - + + + + + + Index: lams_admin/web/register.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/register.jsp,v diff -u -r1.10 -r1.11 --- lams_admin/web/register.jsp 13 Dec 2006 01:59:02 -0000 1.10 +++ lams_admin/web/register.jsp 14 Dec 2007 04:18:18 -0000 1.11 @@ -2,10 +2,10 @@ <%@ include file="/taglibs.jsp"%>
-

- : - -

+

+ +

+


Index: lams_admin/web/remove.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/remove.jsp,v diff -u -r1.7 -r1.8 --- lams_admin/web/remove.jsp 24 Nov 2006 01:47:30 -0000 1.7 +++ lams_admin/web/remove.jsp 14 Dec 2007 04:18:18 -0000 1.8 @@ -12,7 +12,7 @@ -

+

 

   Index: lams_admin/web/serverlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/serverlist.jsp,v diff -u -r1.5 -r1.6 --- lams_admin/web/serverlist.jsp 24 Nov 2006 01:47:30 -0000 1.5 +++ lams_admin/web/serverlist.jsp 14 Dec 2007 04:18:18 -0000 1.6 @@ -1,6 +1,8 @@ <%@ include file="/taglibs.jsp"%> -

:

+

+

+

Index: lams_admin/web/servermaintain.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/servermaintain.jsp,v diff -u -r1.7 -r1.8 --- lams_admin/web/servermaintain.jsp 12 Dec 2007 05:40:46 -0000 1.7 +++ lams_admin/web/servermaintain.jsp 14 Dec 2007 04:18:18 -0000 1.8 @@ -1,12 +1,12 @@ <%@ include file="/taglibs.jsp"%> -

+

: - : - -

+ + -
+

+
Index: lams_admin/web/user.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v diff -u -r1.23 -r1.24 --- lams_admin/web/user.jsp 14 Feb 2007 11:14:04 -0000 1.23 +++ lams_admin/web/user.jsp 14 Dec 2007 04:18:18 -0000 1.24 @@ -3,7 +3,7 @@ -

+

@@ -18,16 +18,17 @@ : +

+ +

- : + - : + -

+ -

 

-
Index: lams_admin/web/userlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/userlist.jsp,v diff -u -r1.24 -r1.25 --- lams_admin/web/userlist.jsp 30 Nov 2007 00:29:27 -0000 1.24 +++ lams_admin/web/userlist.jsp 14 Dec 2007 04:18:18 -0000 1.25 @@ -11,35 +11,82 @@ //--> - -

+ +

- - : - : "> - : : "> - : "> - : + : "> +

+ +

+ + + + + + +

+ + +
+ + + + + + + + + + + + + + + + + + +
::
::
:
+ - + + + + + + + + + + + + + + +
:
:
:
+ -

 

+ + +

+ ' /> +

-

+

' /> - ' /> - - ' /> - +
+

+

+ @@ -92,9 +139,9 @@ - - - + + + Index: lams_admin/web/userorg.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/userorg.jsp,v diff -u -r1.15 -r1.16 --- lams_admin/web/userorg.jsp 5 Dec 2007 05:52:49 -0000 1.15 +++ lams_admin/web/userorg.jsp 14 Dec 2007 04:18:18 -0000 1.16 @@ -109,7 +109,7 @@ } -

+

: "> @@ -121,10 +121,9 @@ : "> - : -

+ -

 

+

Index: lams_admin/web/userorgrole.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/userorgrole.jsp,v diff -u -r1.12 -r1.13 --- lams_admin/web/userorgrole.jsp 24 Nov 2006 01:47:30 -0000 1.12 +++ lams_admin/web/userorgrole.jsp 14 Dec 2007 04:18:18 -0000 1.13 @@ -8,7 +8,7 @@ } -

+

: "> @@ -20,10 +20,10 @@ : "> - : -

-

 

+ +

+

Index: lams_admin/web/userrole.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/userrole.jsp,v diff -u -r1.9 -r1.10 --- lams_admin/web/userrole.jsp 24 Nov 2006 01:47:30 -0000 1.9 +++ lams_admin/web/userrole.jsp 14 Dec 2007 04:18:18 -0000 1.10 @@ -3,7 +3,7 @@ -

+

: "> @@ -17,10 +17,9 @@ : "> - : -

+ -

 

+

Index: lams_admin/web/usersearchlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/usersearchlist.jsp,v diff -u -r1.16 -r1.17 --- lams_admin/web/usersearchlist.jsp 30 Nov 2007 04:48:08 -0000 1.16 +++ lams_admin/web/usersearchlist.jsp 14 Dec 2007 04:18:18 -0000 1.17 @@ -9,10 +9,8 @@ } -

- - : -

+

+

Index: lams_admin/web/config/editconfig.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/config/editconfig.jsp,v diff -u -r1.10 -r1.11 --- lams_admin/web/config/editconfig.jsp 15 Oct 2007 07:08:12 -0000 1.10 +++ lams_admin/web/config/editconfig.jsp 14 Dec 2007 04:18:20 -0000 1.11 @@ -2,12 +2,9 @@ <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %> <%@ include file="/taglibs.jsp"%> -

- : - -

- -
+

+ +

Index: lams_admin/web/import/importGroups.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/import/importGroups.jsp,v diff -u -r1.4 -r1.5 --- lams_admin/web/import/importGroups.jsp 21 Jun 2007 07:09:33 -0000 1.4 +++ lams_admin/web/import/importGroups.jsp 14 Dec 2007 04:18:20 -0000 1.5 @@ -11,15 +11,10 @@ } -

- - : -

- +

+

-

 

-