fix for gallery upload

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+
 Gemfile.lock
 pkg/
 rdoc/

app/controllers/manage/cms_pages_controller.rb

@@ -920,8 +920,8 @@ def receive_gallery
         end
       end
     end
-    
-    finish_upload_status "'#{File.basename(localdir)}'"
+
+    render json: { filename: File.basename(localdir) }.to_json
   end
 
   def gallery_setup

app/views/manage/cms_pages/_gallery_setup.html.erb

@@ -18,5 +18,5 @@
   Resize to be at most <%= text_field_tag :max_width, GalleryMaxWidth, :style => 'width: 40px' %> pixels wide and <%= text_field_tag :max_height, GalleryMaxHeight, :style => 'width: 40px' %> pixels high<br/>
   <%= text_field_tag 'dirname', params[:dirname], :style => 'display: none' %>
   
-  <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "this.disabled = true; this.value = 'Please wait...';" %>
+  <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', 'data-disable-with' => 'Please wait...' %>
 <%- end -%>

app/views/manage/cms_pages/_upload_image.html.erb

@@ -77,6 +77,7 @@
   const nextButton = document.getElementById("upload-image-next-button");
   const finishButton = document.getElementById("upload-image-finish-button");
   const uploadFileField = document.getElementById("file_data");
+  const galleryFileField = document.getElementById("gallery_file_data");
   const galleryNextButton = document.getElementById("upload-gallery-next-button");
 
   nextButton.addEventListener("click", (e) => {
@@ -121,7 +122,7 @@
   uploadGalleryForm.addEventListener("submit", async (e) => {
     e.preventDefault();
 
-    if (uploadFileField.value == "") {
+    if (galleryFileField.value == "") {
       setTimeout(() => {
         galleryNextButton.value = "Next";
         galleryNextButton.dataset.disableWith = null;
@@ -130,10 +131,10 @@
       return;
     }
 
-    let file = uploadFileField.files[0];
-    let formData = new FormData(uploadImageForm);
+    let file = galleryFileField.files[0];
+    let formData = new FormData(uploadGalleryForm);
 
-    let resp = await fetch(uploadImageForm.action, {
+    let resp = await fetch(uploadGalleryForm.action, {
       method: 'POST',
       body: formData
     });