muikku-atests-plugin-rest-model/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>fi.otavanopisto.muikku</groupId>
     <artifactId>parent</artifactId>
-    <version>1.1.24-SNAPSHOT</version>
+    <version>1.1.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

muikku-atests-plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>fi.otavanopisto.muikku</groupId>
     <artifactId>parent</artifactId>
-    <version>1.1.24-SNAPSHOT</version>
+    <version>1.1.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

muikku-atests-plugin/src/main/java/fi/otavanopisto/muikku/atests/AcceptanceTestsRESTService.java

@@ -66,7 +66,6 @@
 import fi.otavanopisto.muikku.plugins.workspace.model.WorkspaceMaterial;
 import fi.otavanopisto.muikku.plugins.workspace.model.WorkspaceMaterialAssignmentType;
 import fi.otavanopisto.muikku.plugins.workspace.model.WorkspaceNode;
-import fi.otavanopisto.muikku.schooldata.SchoolDataBridgeUnauthorizedException;
 import fi.otavanopisto.muikku.schooldata.WorkspaceEntityController;
 import fi.otavanopisto.muikku.schooldata.events.SchoolDataWorkspaceDiscoveredEvent;
 import fi.otavanopisto.muikku.session.local.LocalSession;

muikku-atests/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>fi.otavanopisto.muikku</groupId>
     <artifactId>parent</artifactId>
-    <version>1.1.24-SNAPSHOT</version>
+    <version>1.1.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

muikku-atests/src/test/java/fi/otavanopisto/muikku/ui/PyramusMocks.java

@@ -494,6 +494,7 @@ public static void personsPyramusMocks() throws Exception {
 
   }
 
+  @SuppressWarnings("unused")
   private static StaffMember mockStaffMember(Long personId, Long staffMemberId, String firstName, String lastName, String email, UserRole role, List<String> tags, Map<String, String> variables, List<String> payloads) throws JsonProcessingException {
     ObjectMapper objectMapper = new ObjectMapper().registerModule(new JodaModule()).disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 

muikku-atests/src/test/java/fi/otavanopisto/muikku/ui/base/announcer/AnnouncerTestsBase.java

@@ -73,7 +73,7 @@ public void deleteAnnouncementTest() throws JsonProcessingException, Exception {
         waitForPresent("#ui-datepicker-div");
         addTextToCKEditor("Announcer test announcement");
         waitAndClick(".mf-toolbar input[name='send']");
-        waitForPresent(".an-announcement");
+        waitForPresent(".an-announcement-topic");
         assertTextIgnoreCase(".an-announcement-topic>span", "Test title");
         waitAndClick(".an-announcement-select input");
         waitAndClick(".mf-items-toolbar .icon-delete");

muikku-atests/src/test/java/fi/otavanopisto/muikku/ui/base/course/picker/CoursePickerTestsBase.java

@@ -50,7 +50,7 @@ public void coursePickerLoadMoreTest() throws Exception {
         workspaces.add(createWorkspace("testcourse", "test course for testing " + i.toString(), i.toString(), Boolean.TRUE));
       try {
         getWebDriver().get(getAppUrl(true) + "/coursepicker");
-        waitForPresent("#coursesList");
+        waitForMoreThanSize(".cp-course", 24);
         assertCount(".cp-course", 25);
         waitAndClick(".mf-paging-tool");
         waitForMoreThanSize(".cp-course", 25);

muikku-atests/src/test/java/fi/otavanopisto/muikku/ui/base/course/users/CourseUsersTestsBase.java

@@ -88,7 +88,7 @@ public void courseArchiveStudentTest() throws Exception {
         waitForPresent(".workspace-students-listing-wrapper .workspace-users-name");
         waitAndClick("div[data-user-id='PYRAMUS-STUDENT-2']>div.workspace-users-archive");
         waitAndClick(".archive-button");
-        waitForClickable(".workspace-students-list");
+        waitForPresentAndVisible(".workspace-students-listing-wrapper");
         ObjectMapper objectMapper = new ObjectMapper().registerModule(new JodaModule()).disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         String payload = objectMapper.writeValueAsString(new WebhookStudentUpdatePayload(2l));
         TestUtilities.webhookCall("http://dev.muikku.fi:8080/pyramus/webhook", payload);
@@ -129,11 +129,11 @@ public void courseUnarchiveStudentTest() throws Exception {
         waitForPresent(".workspace-students-listing-wrapper .workspace-users-name");
         waitAndClick("div[data-user-id='PYRAMUS-STUDENT-2']>div.workspace-users-archive");
         waitAndClick(".archive-button");
-        waitForClickable(".workspace-students-list");
+        waitForClickable(".workspace-students-inactive");
         waitAndClick(".workspace-students-inactive");
         waitAndClick("div[data-user-id='PYRAMUS-STUDENT-2']>div.workspace-users-unarchive");
         waitAndClick(".unarchive-button");
-        waitForClickable(".workspace-students-list");
+        waitForPresentAndVisible(".workspace-students-listing-wrapper");
         ObjectMapper objectMapper = new ObjectMapper().registerModule(new JodaModule()).disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         String payload = objectMapper.writeValueAsString(new WebhookStudentUpdatePayload(2l));
         TestUtilities.webhookCall("http://dev.muikku.fi:8080/pyramus/webhook", payload);

muikku-atests/src/test/java/fi/otavanopisto/muikku/ui/base/user/UserTestsBase.java

@@ -4,7 +4,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.joda.time.DateTime;
-import org.junit.Assert;
 import org.junit.Test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;

muikku-atests/src/test/java/fi/otavanopisto/muikku/ui/sauce/user/UserTestsIT.java

@@ -2,14 +2,12 @@
 
 import java.net.MalformedURLException;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 
 import com.saucelabs.common.SauceOnDemandAuthentication;
 import com.saucelabs.junit.SauceOnDemandTestWatcher;
 
-import fi.otavanopisto.muikku.ui.base.indexpage.IndexPageTestsBase;
 import fi.otavanopisto.muikku.ui.base.user.UserTestsBase;
 
 public class UserTestsIT extends UserTestsBase {

muikku-bom/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>fi.otavanopisto.muikku</groupId>
 	<artifactId>bom</artifactId>
-	<version>1.1.24-SNAPSHOT</version>
+	<version>1.1.27-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Muikku BOM</name>
 
@@ -34,11 +34,11 @@
 
 		<!-- Neko -->
 
-		<nekohtml.version>1.9.6.2</nekohtml.version>
+		<nekohtml.version>1.9.22</nekohtml.version>
 
 		<!-- Muikku -->
 
-		<muikku.version>1.1.24-SNAPSHOT</muikku.version>
+		<muikku.version>1.1.27-SNAPSHOT</muikku.version>
 
 		<!-- Coops -->
 		<coops-spec.version>1.0.0</coops-spec.version>
@@ -134,9 +134,9 @@
 			</dependency>
 
 			<!-- Neko -->
-
+      
 			<dependency>
-				<groupId>nekohtml</groupId>
+				<groupId>net.sourceforge.nekohtml</groupId>
 				<artifactId>nekohtml</artifactId>
 				<version>${nekohtml.version}</version>
 			</dependency>

muikku-calendar/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>fi.otavanopisto.muikku</groupId>
     <artifactId>parent</artifactId>
-    <version>1.1.24-SNAPSHOT</version>
+    <version>1.1.27-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

muikku-core-plugins-persistence/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.otavanopisto.muikku</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.24-SNAPSHOT</version>
+		<version>1.1.27-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

muikku-core-plugins-persistence/src/main/java/fi/otavanopisto/muikku/plugins/material/model/QueryOrganizerField.java

@@ -0,0 +1,17 @@
+package fi.otavanopisto.muikku.plugins.material.model;
+
+import javax.persistence.Entity;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Transient;
+
+@Entity
+@PrimaryKeyJoinColumn(name = "id")
+public class QueryOrganizerField extends QueryField {
+
+  @Transient
+  @Override
+  public String getType() {
+    return "application/vnd.muikku.field.organizer";
+  }
+
+}

muikku-core-plugins-persistence/src/main/java/fi/otavanopisto/muikku/plugins/workspace/model/WorkspaceMaterialOrganizerFieldAnswer.java

@@ -0,0 +1,21 @@
+package fi.otavanopisto.muikku.plugins.workspace.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.PrimaryKeyJoinColumn;
+
+@Entity
+@PrimaryKeyJoinColumn(name="id")
+public class WorkspaceMaterialOrganizerFieldAnswer extends WorkspaceMaterialFieldAnswer {
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  @Lob
+  private String value;
+}

muikku-core-plugins/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.otavanopisto.muikku</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.1.24-SNAPSHOT</version>
+		<version>1.1.27-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -138,8 +138,8 @@
 		<!-- Neko -->
 
 		<dependency>
-			<groupId>nekohtml</groupId>
-			<artifactId>nekohtml</artifactId>
+	      <groupId>net.sourceforge.nekohtml</groupId>
+		  <artifactId>nekohtml</artifactId>
 		</dependency>
 
 		<!-- Commons -->

muikku-core-plugins/src/main/java/fi/otavanopisto/muikku/plugins/announcer/WorkspaceAnnouncerBackingBean.java

@@ -1,33 +1,44 @@
 package fi.otavanopisto.muikku.plugins.announcer;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.ejb.Stateful;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.commons.lang3.StringUtils;
 import org.ocpsoft.rewrite.annotation.Join;
 import org.ocpsoft.rewrite.annotation.Matches;
 import org.ocpsoft.rewrite.annotation.Parameter;
 import org.ocpsoft.rewrite.annotation.RequestAction;
 
+import fi.otavanopisto.muikku.jsf.NavigationController;
 import fi.otavanopisto.muikku.jsf.NavigationRules;
 import fi.otavanopisto.muikku.model.users.UserEntity;
+import fi.otavanopisto.muikku.model.workspace.WorkspaceAccess;
 import fi.otavanopisto.muikku.model.workspace.WorkspaceEntity;
+import fi.otavanopisto.muikku.plugins.workspace.WorkspaceBackingBean;
+import fi.otavanopisto.muikku.schooldata.SchoolDataBridgeSessionController;
 import fi.otavanopisto.muikku.schooldata.WorkspaceController;
 import fi.otavanopisto.muikku.schooldata.WorkspaceEntityController;
 import fi.otavanopisto.muikku.schooldata.entity.Workspace;
+import fi.otavanopisto.muikku.security.MuikkuPermissions;
 import fi.otavanopisto.muikku.session.SessionController;
 
 @Named
 @Stateful
 @RequestScoped
-@Join (path = "/workspaceAnnouncer", to = "/jsf/announcer/workspace_announcer.jsf")
+@Join(path = "/workspace/{workspaceUrlName}/announcer", to = "/jsf/workspace/workspace_announcer.jsf")
 public class WorkspaceAnnouncerBackingBean {
 
-  @Parameter ("workspaceEntityId")
-  @Matches ("[0-9]{1,}")
-  private Long workspaceEntityId;
+  @Parameter
+  private String workspaceUrlName;
 
+  @Inject
+  private Logger logger;
+
   @Inject
   private SessionController sessionController;
 
@@ -37,40 +48,73 @@ public class WorkspaceAnnouncerBackingBean {
   @Inject
   private WorkspaceEntityController workspaceEntityController;
 
+  @Inject
+  private NavigationController navigationController;
+
+  @Inject
+  private SchoolDataBridgeSessionController schoolDataBridgeSessionController;
+
+  @Inject
+  @Named
+  private WorkspaceBackingBean workspaceBackingBean;
+
   @RequestAction
   public String init() {
-
-    UserEntity userEntity = sessionController.getLoggedUserEntity();
-
-    if (userEntity == null) {
-      return NavigationRules.ACCESS_DENIED;
+    String urlName = getWorkspaceUrlName();
+
+    if (StringUtils.isBlank(urlName)) {
+      return NavigationRules.NOT_FOUND;
     }
-
-    WorkspaceEntity workspaceEntity = workspaceEntityController.findWorkspaceEntityById(workspaceEntityId);
+
+    WorkspaceEntity workspaceEntity = workspaceController
+        .findWorkspaceEntityByUrlName(urlName);
     if (workspaceEntity == null) {
       return NavigationRules.NOT_FOUND;
     }
 
-    if (!sessionController.hasCoursePermission(AnnouncerPermissions.WORKSPACE_ANNOUNCER_TOOL, workspaceEntity)) {
-      return NavigationRules.ACCESS_DENIED;
+    if (!workspaceEntity.getPublished()) {
+      if (!sessionController.hasCoursePermission(MuikkuPermissions.ACCESS_UNPUBLISHED_WORKSPACE, workspaceEntity)) {
+        return NavigationRules.NOT_FOUND;
+      }
     }
+
+    if (workspaceEntity.getAccess() != WorkspaceAccess.ANYONE) {
+      if (!sessionController.hasCoursePermission(AnnouncerPermissions.WORKSPACE_ANNOUNCER_TOOL, workspaceEntity)) {
+        if (!sessionController.isLoggedIn()) {
+          return navigationController.requireLogin();
+        } else {
+          return NavigationRules.ACCESS_DENIED;
+        }
+      }
+    }
+
+    workspaceBackingBean.setWorkspaceUrlName(urlName);
 
-    Workspace workspace = workspaceController.findWorkspace(workspaceEntity);
-
-    workspaceName = workspace.getName();
-    if (workspace.getNameExtension() != null) {
-      workspaceName += " (" + workspace.getNameExtension() + ")";
+    schoolDataBridgeSessionController.startSystemSession();
+    try {
+      Workspace workspace = workspaceController.findWorkspace(workspaceEntity);
+      if (workspace == null) {
+        logger.log(Level.SEVERE, String.format("Could not find workspace for workspace entity (%d)", workspaceEntity.getId()));
+        return NavigationRules.NOT_FOUND;
+      }
+
+      workspaceName = workspace.getName();
+      workspaceNameExtension = workspace.getNameExtension();
+    } finally {
+      schoolDataBridgeSessionController.endSystemSession();
     }
+
+    workspaceEntityId = workspaceEntity.getId();
 
     return null;
   }
 
-  public Long getWorkspaceEntityId() {
-    return workspaceEntityId;
+  public String getWorkspaceUrlName() {
+    return workspaceUrlName;
   }
 
-  public void setWorkspaceEntityId(Long workspaceEntityId) {
-    this.workspaceEntityId = workspaceEntityId;
+  public void setWorkspaceUrlName(String workspaceUrlName) {
+    this.workspaceUrlName = workspaceUrlName;
   }
 
   public String getWorkspaceName() {
@@ -80,7 +124,25 @@ public String getWorkspaceName() {
   public void setWorkspaceName(String workspaceName) {
     this.workspaceName = workspaceName;
   }
+
+  public String getWorkspaceNameExtension() {
+    return workspaceNameExtension;
+  }
+
+  public void setWorkspaceNameExtension(String workspaceNameExtension) {
+    this.workspaceNameExtension = workspaceNameExtension;
+  }
+
+  public Long getWorkspaceEntityId() {
+    return workspaceEntityId;
+  }
+
+  public void setWorkspaceEntityId(Long workspaceEntityId) {
+    this.workspaceEntityId = workspaceEntityId;
+  }
 
   private String workspaceName;
+  private String workspaceNameExtension;
+  private Long workspaceEntityId;
 
 }