Fix for images in repeat groups.

Fabrik · Jul 2, 2019 · c45f057 · c45f057
1 parent 912e127
commit c45f057
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 11 deletions.
diff --git a/plugins/fabrik_element/image/image-min.js b/plugins/fabrik_element/image/image-min.js
diff --git a/plugins/fabrik_element/image/image.js b/plugins/fabrik_element/image/image.js
@@ -16,21 +16,24 @@ define(['jquery', 'fab/fileelement'], function (jQuery, FbFileElement) {
             if (options.editable) {
                 this.getMyElements();
                 this.imageFolderList = [];
-
                 this.selectedImage = '';
+
+                if (this.options.canSelect === true) {
+                    this.ajaxFolder();
+                    this.element = this.hiddenField;
+                    this.selectedFolder = this.getFolderPath();
+                }
+
                 if (this.imageDir) {
                     if (this.imageDir.options.length !== 0) {
                         this.selectedImage = this.imageDir.get('value');
+                        this.showImage();
                     }
                     this.imageDir.addEvent('change', function (e) {
                         this.showImage(e);
                     }.bind(this));
                 }
-                if (this.options.canSelect === true) {
-                    this.ajaxFolder();
-                    this.element = this.hiddenField;
-                    this.selectedFolder = this.getFolderPath();
-                }
+
             }
         },
 
@@ -47,8 +50,26 @@ define(['jquery', 'fab/fileelement'], function (jQuery, FbFileElement) {
         },
 
         cloned: function (c) {
+            var select = this.element.getElement('select');
+
+            if (select) {
+                select.id = this.origId + '_image' + c;
+                select.name = this.origId + '_image[' + c + ']';
+            }
+
             this.getMyElements();
             this.ajaxFolder();
+
+            if (this.imageDir) {
+                if (this.imageDir.options.length !== 0) {
+                    this.selectedImage = this.imageDir.get('value');
+                    this.showImage();
+                }
+                this.imageDir.addEvent('change', function (e) {
+                    this.showImage(e);
+                }.bind(this));
+            }
+
             this.parent(c);
         },
 
@@ -103,8 +124,15 @@ define(['jquery', 'fab/fileelement'], function (jQuery, FbFileElement) {
                     this.selectedImage = this.imageDir.get('value');
                     this.image.src = Fabrik.liveSite + this.selectedFolder + '/' + this.selectedImage;
                 }
-                //this.hiddenField.value =  this.get('value');//this.selectedImage;
-                this.hiddenField.value = this.getValue();
+
+                if (!this.hiddenField) {
+                    var el = this.element.getParent('.fabrikElement');
+                    this.hiddenField = el.getElement('.folderpath');
+                }
+
+                if (this.hiddenField) {
+                    this.hiddenField.value = this.getValue();
+                }
             }
         },
 

diff --git a/plugins/fabrik_element/image/image.php b/plugins/fabrik_element/image/image.php
@@ -332,8 +332,15 @@ public function render($data, $repeatCounter = 0)
 			}
 
 			// $$$rob not sure about his name since we are adding $repeatCounter to getHTMLName();
-			$layoutData->imageName = $this->getGroupModel()->canRepeat() ? FabrikString::rtrimWord($name, "][$repeatCounter]") . "_image][$repeatCounter]"
-				: $id . '_image';
+			if ($this->getGroupModel()->canRepeat())
+			{
+				$layoutData->imageName = FabrikString::rtrimWord($name, "[$repeatCounter]") . "_image[$repeatCounter]";
+			}
+			else
+			{
+				$layoutData->imageName = $id . '_image';
+			}
+
 			$bits = explode('/', $value);
 			$image = array_pop($bits);