Merge remote-tracking branch 'origin/1.7' into 2.0

Author: mcop1

public/js/pimcore/helpers.js

@@ -2740,7 +2740,7 @@ pimcore.helpers.requestNicePathData = function (source, targets, config, fieldCo
         return;
     }
 
-    if (!config.loadEditModeData && (typeof targets === "undefined" || !fieldConfig.pathFormatterClass)) {
+    if (!config.loadEditModeData && (typeof targets === "undefined" || !fieldConfig.pathFormatterClass || (typeof fieldConfig.visibleFields === "string" && fieldConfig.visibleFields !== '' && fieldConfig.visibleFields.split(',').indexOf('fullpath') === -1))) {
         return;
     }
 

public/js/pimcore/object/classes/data/countrymultiselect.js

@@ -151,6 +151,11 @@ pimcore.object.classes.data.countrymultiselect = Class.create(pimcore.object.cla
 
     applyData: function ($super) {
         $super();
+
+        if(this.isInCustomLayoutEditor()) {
+            return;
+        }
+
         delete this.datax.options;
     },
 

public/js/pimcore/object/classes/data/multiselect.js

@@ -293,6 +293,10 @@ pimcore.object.classes.data.multiselect = Class.create(pimcore.object.classes.da
 
         $super();
 
+        if(this.isInCustomLayoutEditor()) {
+            return;
+        }
+
         var options = [];
 
         var valueEditor = this.specificPanel.getComponent("valueeditor");

public/js/pimcore/object/classes/data/select.js

@@ -283,6 +283,10 @@ pimcore.object.classes.data.select = Class.create(pimcore.object.classes.data.da
 
         $super();
 
+        if(this.isInCustomLayoutEditor()) {
+            return;
+        }
+
         let options = [];
 
         let valueEditor = this.specificPanel.getComponent("valueeditor") ?? null;