From 013de7c65f898827f0e561c8d5787500bba111c8 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 25 May 2018 11:36:50 +0200
Subject: [PATCH] googleLicenseConsent is passed properly in new API
---
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js | 10 ++++++++--
.../api/projects/overlays/OverlayRestImpl.java | 5 +++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
index de05099c6d..436d9125c7 100644
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
@@ -212,6 +212,7 @@ OverlayPanel.prototype.createTableHeader = function (edit) {
*
* @param {DataOverlay} overlay
* @param {boolean} checked
+ * @param {boolean} disabled
* @returns {HTMLElement}
*/
OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled) {
@@ -279,9 +280,10 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
*
* @param {DataOverlay} overlay
* @param {boolean} checked
+ * @param {boolean} disabled
* @returns {Array}
*/
-OverlayPanel.prototype.overlayToDataRow = function (overlay, checked) {
+OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled) {
var result = [];
result[0] = overlay.getOrder();
result[1] = overlay.getName();
@@ -291,7 +293,11 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked) {
if (checked) {
checkedString = " checked ";
}
- result[2] = "<input type='checkbox' " + checkedString + " data='" + overlay.getId() + "' name='overlayToggle'/>";
+ var disabledString = "";
+ if (disabled) {
+ disabledString = " disabled "
+ }
+ result[2] = "<input type='checkbox' " + checkedString + disabledString + " data='" + overlay.getId() + "' name='overlayToggle'/>";
result[3] = "<button data='" + overlay.getId() + "' name='download-overlay'><span class='ui-icon ui-icon-arrowthickstop-1-s'></span></button>";
} else {
result[2] = "<a href='#' data='" + overlay.getId() + "' name='overlayLink'><img src='" + GuiConnector.getImgPrefix() + "icons/search.png' style='float: left' hspace='5'/></a>";
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
index 4c4a6e48cf..9e41483891 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
@@ -99,6 +99,7 @@ public class OverlayRestImpl extends BaseRestImpl {
result.put("description", overlay.getDescription());
result.put("publicOverlay", overlay.isPublicLayout());
result.put("defaultOverlay", overlay.isDefaultOverlay());
+ result.put("googleLicenseConsent", overlay.isGoogleLicenseConsent());
List<Map<String, Object>> images = new ArrayList<>();
List<Layout> childLayouts = new ArrayList<>();
childLayouts.add(overlay);
@@ -411,8 +412,8 @@ public class OverlayRestImpl extends BaseRestImpl {
String column = string.toLowerCase();
Object value = null;
if (column.equals("id") || column.equals("idobject") || column.equals("uniqueid")) {
- //casting to string is only to provide the same results as before refactoring
- value = bioEntity.getId()+"";
+ // casting to string is only to provide the same results as before refactoring
+ value = bioEntity.getId() + "";
} else if (column.equals("modelid")) {
value = bioEntity.getModel().getId();
} else if (column.equals("value")) {
--
GitLab