Merged issue-127 to master. Resolution of issue softwareloop#127.

loftuxab · Jul 19, 2018 · 0d10470 · 0d10470
2 parents 81ef0c4 + f50b497
commit 0d10470
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/surf/.gitignore b/surf/.gitignore
@@ -1 +1,2 @@
 /.settings/
+*.classpath
diff --git a/surf/src/main/amp/web/components/uploader-plus/js/dnd-upload-plus.js b/surf/src/main/amp/web/components/uploader-plus/js/dnd-upload-plus.js
@@ -52,6 +52,10 @@
                     return;
                 }
 
+                if (!this.shouldUseSameMetadataSet) {
+                	this.cleanupOldFormForNextUpload();
+                }
+
                 if (this.showConfig.mode === this.MODE_SINGLE_UPDATE) {
                     Alfresco.logger.debug("Single update");
                     return SoftwareLoop.DNDUpload.superclass._spawnUploads.call(this);

diff --git a/surf/src/main/amp/web/components/uploader-plus/js/flash-upload-plus.js b/surf/src/main/amp/web/components/uploader-plus/js/flash-upload-plus.js
@@ -30,7 +30,11 @@
             Alfresco.logger.debug("show", arguments);
 
             SoftwareLoop.FlashUpload.superclass.show.call(this, config);
-
+
+            if (!this.shouldUseSameMetadataSet) {
+            	this.cleanupOldFormForNextUpload();
+            }
+
             this.loadTypes(this.populateSelect, this);
             Alfresco.logger.debug("END show");
         },

diff --git a/surf/src/main/amp/web/components/uploader-plus/js/html-upload-plus.js b/surf/src/main/amp/web/components/uploader-plus/js/html-upload-plus.js
@@ -31,6 +31,10 @@
 
                 SoftwareLoop.HtmlUpload.superclass.show.call(this, config);
 
+                if (!this.shouldUseSameMetadataSet) {
+                	this.cleanupOldFormForNextUpload();
+                }
+
                 this.loadTypes(function () {
                     Alfresco.logger.debug("loadTypes callback");
                     this.populateSelect();

diff --git a/surf/src/main/amp/web/components/uploader-plus/js/uploader-plus-mixin.js b/surf/src/main/amp/web/components/uploader-plus/js/uploader-plus-mixin.js
@@ -302,6 +302,8 @@
                         delete fileInfo.propertyData.prop_cm_name;
                     }
                 }while((++this.currentRecordIndex<this.records.length) && this.shouldUseSameMetadataSet);
+
+                this.cleanupOldFormForNextUpload();
                 this.showMetadataDialog();
             } else {
                 Alfresco.logger.debug("Form with errors");
@@ -368,6 +370,7 @@
             var propertyData = formRuntime._buildAjaxForSubmit(form);
             propertyData.contentType = contentType;
             this.fileStore[data.id].propertyData = propertyData;
+
             Alfresco.logger.debug("END processMetadata", propertyData);
         },
 
@@ -401,7 +404,17 @@
             Alfresco.logger.debug("centerPanel", arguments);
             this.getPanel().center();
             Alfresco.logger.debug("END centerPanel");
+        },
+
+        /**
+         * Metadata form might already have some leftovers, clean up old form HTML for next upload
+         */
+        cleanupOldFormForNextUpload: function() {
+            var formHtmlId = this.id + "-metadata-form";
+            var formNode = YAHOO.util.Dom.get(formHtmlId);
+            while (formNode.hasChildNodes()) {
+                formNode.removeChild(formNode.lastChild);
+            }
         }
-
     };
 })();