diff --git a/CHANGELOG b/CHANGELOG
index a81fa6f18cb695d238fd6678690077fad56da89c..cb26a0148def20bd57295309e25d64b3bc39c418 100644
--- a/CHANGELOG
+++ b/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
diff --git a/frontend-js/src/main/js/gui/AddOverlayDialog.js b/frontend-js/src/main/js/gui/AddOverlayDialog.js
index da1a8cdc1cc1a68453024da6ba65d39d62b0f8be..d49c6a153db8f9436d021c8a4126d5cb3cbc9436 100644
--- a/frontend-js/src/main/js/gui/AddOverlayDialog.js
+++ b/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);
diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
index 436d9125c759973f56e9f1554444360a3eb8f811..ad6006a376b58b4ed02ce95909ace8e77cbb471b 100644
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/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 = [{
diff --git a/persist/src/db/11.1.1/fix_db_20180626.sql b/persist/src/db/11.1.1/fix_db_20180626.sql
new file mode 100644
index 0000000000000000000000000000000000000000..a33b6ad89d4881c84fb355b8c56d309760e66b70
--- /dev/null
+++ b/persist/src/db/11.1.1/fix_db_20180626.sql
@@ -0,0 +1 @@
+-- empty file to force directory to be commited to git repo
diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java b/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java
index 385a8626ee9bc9db38c0e38a4733aa32c077dbc1..6eb486fdb5f1d404cb20b66d9fb9dded3d08ff1f 100644
--- a/service/src/main/java/lcsb/mapviewer/services/impl/UserService.java
+++ b/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) {
diff --git a/web/src/main/webapp/resources/other/admin_guide.pdf b/web/src/main/webapp/resources/other/admin_guide.pdf
deleted file mode 100644
index a1f36ad2e63fb11403a5d34ce0d45e47b69c8e96..0000000000000000000000000000000000000000
Binary files a/web/src/main/webapp/resources/other/admin_guide.pdf and /dev/null differ