Merge branch 'devel_11.1.x-clean'

CHANGELOG

@@ -3,7 +3,7 @@ minerva (12.0.0~beta.5) unstable; urgency=medium
   * Bug fix: there was a question about Terms of Use when ToU was undefined
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 8 Jun 2018 15:00:00 +0200
- 
+
 minerva (12.0.0~beta.4) unstable; urgency=medium
   * Bug fix: openlayers issue with devices with high Device Pixel Ratio
 
@@ -107,6 +107,16 @@ minerva (12.0.0~alpha.0) unstable; urgency=medium
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 21 Feb 2018 12:00:00 +0200
 
+minerva (11.1.1) stable; urgency=medium
+  * Bug fix: Updating privileges takes much less time
+  * Bug fix: Concurent update on privileges shouldn't crash anymore
+  * Bug fix: Search by element id crashed when submaps were available
+  * Bug fix: GO connector uses new API, because the old one was turned off
+    and stopped working
+
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 27 Jun 2018 15:00:00 +0200
+
 minerva (11.1.0) stable; urgency=high
   * User can provide Google Maps API key that must be registered in google
     cloud account

frontend-js/src/main/js/gui/AddOverlayDialog.js

@@ -73,11 +73,14 @@ AddOverlayDialog.prototype.createGui = function () {
   content.appendChild(contentInput);
   content.appendChild(guiUtils.createNewLine());
 
-  var consentCheckbox = Functions.createElement({type:"input", name:"overlay-google-consent"});
+  var consentCheckbox = Functions.createElement({type: "input", name: "overlay-google-consent"});
   consentCheckbox.type = "checkbox";
   content.appendChild(consentCheckbox);
-  content.appendChild(guiUtils.createLabel("I am aware that this map is displayed under the terms of the <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>license of Google Maps Platform</a> and I agree to these terms. " +
-    "In particular, I warrant that this dataset does not contain Protected Health Information (as defined in and subject to HIPAA). "));
+  content.appendChild(guiUtils.createLabel("I am aware that if this map is displayed using Google Maps API, " +
+    "it falls under their license <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>" +
+    "https://cloud.google.com/maps-platform/terms/</a>, to which I agree. I warrant that this dataset contains no " +
+    "Protected Health Information (as defined in and subject to HIPAA)."));
+
   content.appendChild(guiUtils.createNewLine());
 
   self.getElement().appendChild(content);

frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js

@@ -339,8 +339,11 @@ OverlayPanel.prototype.openEditOverlayDialog = function (overlay) {
   var consentCheckbox = document.createElement("input");
   consentCheckbox.type = "checkbox";
   consentCheckbox.checked = overlay.isGoogleLicenseConsent();
-  row = guiUtils.createTableRow([guiUtils.createLabel("I am aware that this map is displayed under the terms of the <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>license of Google Maps Platform</a> and I agree to these terms. " +
-    "In particular, I warrant that this dataset does not contain Protected Health Information (as defined in and subject to HIPAA). "), consentCheckbox]);
+
+  row = guiUtils.createTableRow([guiUtils.createLabel("I am aware that if this map is displayed using Google Maps API, " +
+    "it falls under their license <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>" +
+    "https://cloud.google.com/maps-platform/terms/</a>, to which I agree. I warrant that this dataset contains no " +
+    "Protected Health Information (as defined in and subject to HIPAA)."), consentCheckbox]);
   content.appendChild(row);
 
   var buttons = [{

persist/src/db/11.1.1/fix_db_20180626.sql

+-- empty file to force directory to be commited to git repo

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

@@ -107,23 +107,28 @@ public class UserService implements IUserService {
     return getUserPrivilegeLevel(user, type, object) > 0;
   }
 
-  @Override
-  public void setUserPrivilege(User user, BasicPrivilege privilege) {
-    privilege.setUser(user);
-    BasicPrivilege oldPrivilege = null;
-    for (BasicPrivilege privilegeIter : user.getPrivileges()) {
-      if (privilegeIter.equalsPrivilege(privilege)) {
-        oldPrivilege = privilegeIter;
-      }
+	@Override
+	public void setUserPrivilege(User user, BasicPrivilege privilege) {
+		updateUserPrivilegesWithoutDbModification(user, privilege);
+		updateUser(user);
+		userDao.flush();
+	}
+
+    private void updateUserPrivilegesWithoutDbModification(User user, BasicPrivilege privilege) {
+		BasicPrivilege oldPrivilege = null;
+		for (BasicPrivilege privilegeIter : user.getPrivileges()) {
+			if (privilegeIter.equalsPrivilege(privilege)) {
+				oldPrivilege = privilegeIter;
+			}
+		}
+		if (oldPrivilege != null) {
+		    privilege.setUser(null);
+		    oldPrivilege.setLevel(privilege.getLevel());
+		} else {
+		    privilege.setUser(user);
+		    user.getPrivileges().add(privilege);
+		}
     }
-    if (oldPrivilege != null) {
-      user.getPrivileges().remove(oldPrivilege);
-      oldPrivilege.setUser(null);
-    }
-    user.getPrivileges().add(privilege);
-    updateUser(user);
-    userDao.flush();
-  }
 
   @Override
   public void addUser(User user) {