From ec16869f5103e3da22eb70775655edb9dc9e164e Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 8 Jun 2018 14:34:41 +0200
Subject: [PATCH] upload of data overlay didn't work
---
frontend-js/src/main/js/ServerConnector.js | 10 +++++++++-
frontend-js/src/main/js/gui/AddOverlayDialog.js | 7 ++++---
...92&googleLicenseConsent=false&token=MOCK_TOKEN_ID&} | 0
3 files changed, 13 insertions(+), 4 deletions(-)
rename frontend-js/testFiles/apiCalls/projects/sample/overlays/{POST_fileId=6792&token=MOCK_TOKEN_ID& => POST_fileId=6792&googleLicenseConsent=false&token=MOCK_TOKEN_ID&} (100%)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 6efe146936..435ea3e9a4 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -1727,6 +1727,13 @@ ServerConnector.addComment = function (params) {
});
};
+/**
+ *
+ * @param {DataOverlay} params.overlay
+ * @param {string|number} params.fileId
+ * @param {string} [params.projectId]
+ * @returns {PromiseLike<DataOverlay>}
+ */
ServerConnector.addOverlay = function (params) {
var overlay = params.overlay;
if (!(overlay instanceof DataOverlay)) {
@@ -1739,6 +1746,7 @@ ServerConnector.addOverlay = function (params) {
description: overlay.getDescription(),
content: overlay.getContent(),
filename: overlay.getFilename(),
+ googleLicenseConsent: overlay.isGoogleLicenseConsent(),
fileId: params.fileId
};
return self.getProjectId(params.projectId).then(function (result) {
@@ -1788,7 +1796,7 @@ ServerConnector.updateOverlay = function (overlay) {
creator: overlay.getCreator(),
publicOverlay: overlay.getPublicOverlay(),
defaultOverlay: overlay.isDefaultOverlay(),
- googleLicenseConsent : overlay.isGoogleLicenseConsent()
+ googleLicenseConsent: overlay.isGoogleLicenseConsent()
}
};
return self.sendPatchRequest(self.updateOverlayUrl(queryParams), filterParams);
diff --git a/frontend-js/src/main/js/gui/AddOverlayDialog.js b/frontend-js/src/main/js/gui/AddOverlayDialog.js
index d0813b9624..da1a8cdc1c 100644
--- a/frontend-js/src/main/js/gui/AddOverlayDialog.js
+++ b/frontend-js/src/main/js/gui/AddOverlayDialog.js
@@ -165,8 +165,10 @@ AddOverlayDialog.prototype.addOverlay = function () {
var overlay = new DataOverlay({
name: nameInput.value,
description: descriptionInput.value,
- filename: filename
+ filename: filename,
+ googleLicenseConsent: consent
});
+
if (filename === undefined || filename === "") {
filename = "unknown.txt";
}
@@ -178,8 +180,7 @@ AddOverlayDialog.prototype.addOverlay = function () {
return ServerConnector.addOverlay({
fileId: file.id,
overlay: overlay,
- projectId: self.getProject().getProjectId(),
- googleLicenseConsent: consent
+ projectId: self.getProject().getProjectId()
});
}).then(function (result) {
overlay = result;
diff --git a/frontend-js/testFiles/apiCalls/projects/sample/overlays/POST_fileId=6792&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/projects/sample/overlays/POST_fileId=6792&googleLicenseConsent=false&token=MOCK_TOKEN_ID&
similarity index 100%
rename from frontend-js/testFiles/apiCalls/projects/sample/overlays/POST_fileId=6792&token=MOCK_TOKEN_ID&
rename to frontend-js/testFiles/apiCalls/projects/sample/overlays/POST_fileId=6792&googleLicenseConsent=false&token=MOCK_TOKEN_ID&
--
GitLab