Merge branch 'master' into devel

danmunn · Oct 24, 2024 · b8e2d5c · b8e2d5c
2 parents e2225ad + 832ec06
commit b8e2d5c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
@@ -41,25 +41,28 @@ def permissions
 
   def upload_files
     uploaded_files = params[:dmsf_attachments]
+    @uploads = []
     # Commit
     if params[:commit] == l(:label_dmsf_upload_commit)
       uploaded_files&.each do |key, uploaded_file|
         upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, uploaded_file)
+        next unless upload
+
+        @uploads.push upload
         params[:committed_files][key][:disk_filename] = upload.disk_filename
         params[:committed_files][key][:digest] = upload.digest
         params[:committed_files][key][:tempfile_path] = upload.tempfile_path
       end
-      commit_files
+      commit_files if params[:committed_files].present?
     # Upload
     else
-      @uploads = []
       # standard file input uploads
       uploaded_files&.each do |_, uploaded_file|
         upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, uploaded_file)
         @uploads.push(upload) if upload
       end
-      flash.now[:error] = "#{l(:label_attachment)} #{l('activerecord.errors.messages.invalid')}" if @uploads.empty?
     end
+    flash.now[:error] = "#{l(:label_attachment)} #{l('activerecord.errors.messages.invalid')}" if @uploads.empty?
   end
 
   # REST API and Redmine attachment form

diff --git a/assets/javascripts/attachments_dmsf.js b/assets/javascripts/attachments_dmsf.js
@@ -306,7 +306,11 @@ dmsfAjaxUpload.uploading = 0;
 
 function dmsfRemoveFileLbl() {
 
-    $(this).parent('span').remove();
+    let span = $(this).parent('span');
+
+    span.next('div').remove();
+    span.next('br').remove();
+    span.remove();
 
     return false;
 }

diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
@@ -274,8 +274,13 @@ def attachment_row(dmsf_file, link, issue, controller)
             if issue.attributes_editable? && ((link && User.current.allowed_to?(:file_manipulation,
                                                                                 dmsf_file.project)) || (!link &&
               User.current.allowed_to?(:file_delete, dmsf_file.project)))
+              url = if link
+                      dmsf_link_path link, commit: 'yes', back_url: issue_path(issue)
+                    else
+                      dmsf_file_path id: dmsf_file, commit: 'yes', back_url: issue_path(issue)
+                    end
               html << link_to('',
-                              link ? dmsf_link_path(link, commit: 'yes', back_url: issue_path(issue)) : dmsf_file_path(id: dmsf_file, commit: 'yes', back_url: issue_path(issue)),
+                              url,
                               data: { confirm: l(:text_are_you_sure) },
                               method: :delete,
                               title: l(:button_delete),