From fe359ca1cffa269311055bd48cdafb6c72febda4 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 5 Jun 2018 09:25:03 +0200
Subject: [PATCH] when terms of use aren't defined user is not ask to accept
them
additionally changelog updated
---
CHANGELOG | 6 ++++--
frontend-js/src/main/js/minerva.js | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 815b77afa7..5727e89b6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,10 @@
minerva (11.1.0) stable; urgency=high
* User can provide Google Maps API key that must be registered in google
cloud account
-
- -- Piotr Gawron <piotr.gawron@uni.lu> Mon, 14 May 2018 9:00:00 +0200
+ * User data overlays must be Google Maps API terms of use compliant
+ * Terms of Use added
+
+ -- Piotr Gawron <piotr.gawron@uni.lu> Tue, 05 Jun 2018 9:00:00 +0200
minerva (11.0.10) stable; urgency=medium
* Bug fix: link from overview image to search result was broken
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 6556f66841..2c9e3d0e58 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -58,6 +58,9 @@ function processUrlGetParams(params) {
}
function requestConsent(user, termsOfUseUrl) {
+ if (termsOfUseUrl === "") {
+ return;
+ }
var dialog = document.createElement("div");
var dialogContent = document.createElement("div");
dialogContent.appendChild(functions.createElement({
--
GitLab