From 5db27a127123641748e437bd2dd12c51c57177a0 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Mon, 18 Feb 2019 12:42:16 +0100
Subject: [PATCH] Merge branch 'next_version' into
evolution/60-ajout-de-plusieurs-documents-simultanes
---
client/css/icons/style.css | 3 +++
client/javascript/externs/mapJSON/MapJSON.js | 7 +++++--
vas/rest/class/vmlib/files/Files_manager.class.inc | 2 +-
vas/rest/conf/properties_server.inc | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/client/css/icons/style.css b/client/css/icons/style.css
index 90f70bd0..995a6b2a 100644
--- a/client/css/icons/style.css
+++ b/client/css/icons/style.css
@@ -596,6 +596,9 @@
.icon-language1:before {
content: "\e2a8";
}
+.icon-vm4vmp:before {
+ content: "\e2a8";
+}
.icon-layers:before {
content: "\e1d3";
}
diff --git a/client/javascript/externs/mapJSON/MapJSON.js b/client/javascript/externs/mapJSON/MapJSON.js
index 0d98c048..1f631eb3 100755
--- a/client/javascript/externs/mapJSON/MapJSON.js
+++ b/client/javascript/externs/mapJSON/MapJSON.js
@@ -597,8 +597,11 @@ MapJSON.prototype.getLayerFromLayerDef_ = function (oMapDefinition, oLayerDef, o
}
if (goog.isDefAndNotNull(oLayerDef['is_filtered'])) {
if (goog.isDefAndNotNull(oLayerDef['filter_form'])) {
- if (goog.isString(oLayerDef['filter_form']) && oLayerDef['filter_form'].length !== 0) {
- oLayerDef['filter_form'] = JSON.parse(oLayerDef['filter_form']);
+ if ((goog.isString(oLayerDef['filter_form']) && oLayerDef['filter_form'].length !== 0) ||
+ goog.isObject(oLayerDef['filter_form'])) {
+ if (goog.isString(oLayerDef['filter_form'])) {
+ oLayerDef['filter_form'] = JSON.parse(oLayerDef['filter_form']);
+ }
oLayerDef['filter_values'] = this.getFilterFormValues_(oLayerDef['filter_form']);
layer.set('filter_form', oLayerDef['filter_form']);
layer.set('filter_form_embedjs', oLayerDef['filter_form_embedjs']);
diff --git a/vas/rest/class/vmlib/files/Files_manager.class.inc b/vas/rest/class/vmlib/files/Files_manager.class.inc
index 107b1f23..598dfd49 100644
--- a/vas/rest/class/vmlib/files/Files_manager.class.inc
+++ b/vas/rest/class/vmlib/files/Files_manager.class.inc
@@ -363,7 +363,7 @@ class Files_manager{
$aThumbnailFileStruct = $aFileStruct;
$aThumbnailFileStruct["width"] = 200;
$aThumbnailFileStruct["height"] = 200;
-
+
if (is_int($this->oProperties['filesystem_thumbnails_width'])) {
$aThumbnailFileStruct["width"] = $this->oProperties['filesystem_thumbnails_width'];
}
diff --git a/vas/rest/conf/properties_server.inc b/vas/rest/conf/properties_server.inc
index e14c4eb7..7eb11560 100644
--- a/vas/rest/conf/properties_server.inc
+++ b/vas/rest/conf/properties_server.inc
@@ -50,7 +50,7 @@ $properties["notifierSecretKeyAccount"] = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
// utilisation de s3 pour remplacer le système de Fichier
$properties['filesystem'] = 'fs'; // s3
$properties['filesystem_thumbnails_width'] = 350; // taille des images .min.jpg
-$properties['filesystem_thumbnails_height'] = 350; // taille des images .min.jpg
+$properties['filesystem_thumbnails_height'] = 350; // taille des images .min.jpg
$properties['AWSCredentialsFilePath'] = ""; // .../.aws/credentials
$properties["fileS3UploaderProfil"] = "";
$properties["fileS3UploaderBucket"] = "";
--
GitLab