Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v diff -u -r1.45.2.13 -r1.45.2.14 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 31 Oct 2016 16:16:34 -0000 1.45.2.13 +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 23 Nov 2016 15:28:08 -0000 1.45.2.14 @@ -68,14 +68,11 @@ private static ILearningDesignService learningDesignService; private static ISecurityService securityService; - private Integer stateId = OrganisationState.ACTIVE; - @Override @SuppressWarnings({ "unchecked" }) public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - stateId = WebUtil.readIntParam(request, "stateId", false); Integer orgId = WebUtil.readIntParam(request, "orgId", false); Organisation org = null; @@ -132,7 +129,7 @@ // First, populate header part List links = new ArrayList(); List moreLinks = new ArrayList(); - if (isSysAdmin && stateId.equals(OrganisationState.ACTIVE)) { + if (isSysAdmin) { if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) { moreLinks.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", null)); @@ -144,8 +141,8 @@ links.add(new IndexLinkBean("index.coursegradebook.learner", link, "fa fa-fw fa-list-ol", null)); } - if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) - || roles.contains(Role.ROLE_MONITOR)) && stateId.equals(OrganisationState.ACTIVE)) { + if (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) + || roles.contains(Role.ROLE_MONITOR)) { if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) { if ((!isSysAdmin) && (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) { @@ -204,12 +201,6 @@ orgBean.setLinks(links); orgBean.setMoreLinks(moreLinks); - // set archived date if archived - if (stateId.equals(OrganisationState.ARCHIVED) - && org.getOrganisationState().getOrganisationStateId().equals(OrganisationState.ARCHIVED)) { - orgBean.setArchivedDate(org.getArchivedDate()); - } - // now populate group contents orgBean = populateContentsOrgBean(orgBean, org, roles, username, isSysAdmin); @@ -235,7 +226,7 @@ List childOrgBeans = new ArrayList(); for (Organisation organisation : children) { - if (organisation.getOrganisationState().getOrganisationStateId().equals(stateId)) { + if (OrganisationState.ACTIVE.equals(organisation.getOrganisationState().getOrganisationStateId())) { List classRoles = new ArrayList(); List userOrganisationRoles = getService() .getUserOrganisationRoles(organisation.getOrganisationId(), username); @@ -285,7 +276,7 @@ LinkedList lessonLinks = new LinkedList(); String url = null; Integer lessonStateId = bean.getState(); - if (stateId.equals(OrganisationState.ACTIVE) && roles.contains(Role.ROLE_LEARNER) + if (roles.contains(Role.ROLE_LEARNER) && (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE))) { url = "javascript:openLearner(" + bean.getId() + ")"; } @@ -317,8 +308,7 @@ lessonLinks = new LinkedList(); } - if ((isGroupManagerOrMonitor && stateId.equals(OrganisationState.ACTIVE)) - || (stateId.equals(OrganisationState.ARCHIVED) && roles.contains(Role.ROLE_GROUP_MANAGER))) { + if (isGroupManagerOrMonitor) { lessonLinks.addFirst(new IndexLinkBean("index.monitor", "javascript:showMonitorLessonDialog(" + bean.getId() + ")", "fa fa-fw fa-heartbeat", null)); } Index: lams_central/web/lessons.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lessons.jsp,v diff -u -r1.2.16.3 -r1.2.16.4 --- lams_central/web/lessons.jsp 27 Oct 2016 16:02:36 -0000 1.2.16.3 +++ lams_central/web/lessons.jsp 23 Nov 2016 15:28:08 -0000 1.2.16.4 @@ -75,7 +75,7 @@
" - onclick="javascript:document.location='index.do?state=active&method=profile'" /> + onclick="javascript:document.location='index.do?method=profile'" />
Index: lams_central/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v diff -u -r1.77.2.34 -r1.77.2.35 --- lams_central/web/main.jsp 7 Nov 2016 17:54:57 -0000 1.77.2.34 +++ lams_central/web/main.jsp 23 Nov 2016 15:28:08 -0000 1.77.2.35 @@ -87,7 +87,6 @@ EMAIL_TITLE : '', }, - stateId = 1, // TODO Figure out when stateId is required to be equal 3. Old version code: stateId = tabName == 'profile' ? 3 : 1; activeOrgId = null${lastVisitedOrganisationId}; $(document).ready(function(){ Index: lams_central/web/profile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/profile.jsp,v diff -u -r1.23.2.5 -r1.23.2.6 --- lams_central/web/profile.jsp 7 Nov 2016 09:32:45 -0000 1.23.2.5 +++ lams_central/web/profile.jsp 23 Nov 2016 15:28:08 -0000 1.23.2.6 @@ -62,7 +62,7 @@
   @@ -72,18 +72,18 @@    Index: lams_central/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.1.2.7 -r1.1.2.8 --- lams_central/web/WEB-INF/struts-config.xml 23 Nov 2016 14:47:50 -0000 1.1.2.7 +++ lams_central/web/WEB-INF/struts-config.xml 23 Nov 2016 15:28:08 -0000 1.1.2.8 @@ -533,12 +533,12 @@ > @@ -592,12 +592,12 @@ > @@ -681,12 +681,12 @@ /> Index: lams_central/web/includes/javascript/main.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v diff -u -r1.1.2.14 -r1.1.2.15 --- lams_central/web/includes/javascript/main.js 18 Nov 2016 17:05:30 -0000 1.1.2.14 +++ lams_central/web/includes/javascript/main.js 23 Nov 2016 15:28:08 -0000 1.1.2.15 @@ -134,7 +134,6 @@ $("#org-container").load( "displayGroup.do", { - stateId : stateId, orgId : activeOrgId }, function( response, status, xhr ) {