Merge branch '679-adding-new-project' into 'devel_12.1.x'

Resolve "Adding new project makes users custom overlays = "Default user privilege for: Custom overlays""

See merge request !633

CHANGELOG

+minerva (12.1.8) stable; urgency=medium
+  * Bug fix: add a project reset users custom overlays limit to default (#679)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 8 Feb 2019 15:30:00 +0200
+
 minerva (12.1.7) stable; urgency=medium
   * Bug fix: problems with updating privileges introduced in 12.1.6 fixed
 

service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java

@@ -475,7 +475,6 @@ public class ProjectService implements IProjectService {
     for (User user : userDao.getAll()) {
       if (!processedUser.contains(user)) {
         processedUser.add(user);
-        userService.createDefaultBasicPrivilegesForUser(user);
         userService.createDefaultProjectPrivilegesForUser(project, user);
       }
     }

service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java

@@ -857,6 +857,32 @@ public class ProjectServiceTest extends ServiceTestFunctions {
     }
   }
 
+  @Test
+  public void testCheckGlobalPrivilegesAfterCreateProject() throws Exception {
+    try {
+      createUser();
+      for (PrivilegeType type : PrivilegeType.values()) {
+        if (type.getPrivilegeObjectType() == null) {
+          userService.setUserPrivilege(user, type, 2);
+        }
+      }
+
+      String filename = "testFiles/complexModel/empty_complex_model.zip";
+      Project project = createComplexProject(projectId, filename);
+
+      for (PrivilegeType type : PrivilegeType.values()) {
+        if (type.getPrivilegeObjectType() == null) {
+          assertEquals("Global privilege was modified: " + type, 2, userService.getUserPrivilegeLevel(user, type));
+        }
+      }
+
+      projectService.removeProject(project, null, false, adminToken);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+
   @Test
   public void testUpdateProjectWithoutModel() throws Exception {
     try {