Merge branch 'devel'

danmunn · Oct 24, 2024 · 3f1d1f5 · 3f1d1f5
2 parents 177e260 + 601c993
commit 3f1d1f5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog for Redmine DMSF
 ==========================
 
+3.2.4 *2024-10-24*
+------------------
+
+    Multiple file upload fix
+
+* Bug: #1559 - Multiple files upload
+* Bug: #1558 - Deleting of uploaded files
+
 3.2.3 *2024-10-18*
 ------------------
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Redmine DMSF Plugin 3.2.3
+Redmine DMSF Plugin 3.2.4
 =========================
 
 [![GitHub CI](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml/badge.svg?branch=master)](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml)

diff --git a/assets/help/en/dmsf_help.html b/assets/help/en/dmsf_help.html
diff --git a/assets/javascripts/attachments_dmsf.js b/assets/javascripts/attachments_dmsf.js
@@ -151,8 +151,8 @@ function dmsfAddFile(inputEl, file, eagerUpload) {
 
     let attachments = $('#dmsf_attachments_fields');
     let max = ($(inputEl).attr('multiple') == 'multiple') ? 10 : 1
-
-    if (attachments.children().length < max) {
+    
+    if (attachments.children('.attachment').length < max) {
 
         let attachmentId = dmsfAddFile.nextAttachmentId++;
         let fileSpan = $('<span>', { id: 'dmsf_attachments_' + attachmentId, 'class': 'attachment' });

diff --git a/init.rb b/init.rb
@@ -24,7 +24,7 @@
   author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors'
   author 'Vít Jonáš / Daniel Munn / Karel Pičman'
   description 'Document Management System Features'
-  version '3.2.3'
+  version '3.2.4'
 
   requires_redmine version_or_higher: '5.0.0'
 

diff --git a/lib/redmine_dmsf.rb b/lib/redmine_dmsf.rb
@@ -42,7 +42,7 @@
 require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/custom_field_patch"
 
 # A workaround for obsolete 'alias_method' usage in RedmineUp's plugins
-if RedmineDmsf::Plugin.an_obsolete_plugin_present?
+if defined?(EasyExtensions) || RedmineDmsf::Plugin.an_obsolete_plugin_present?
   require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_ru_patch"
 else
   require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_patch"

diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
@@ -275,7 +275,7 @@ def attachment_row(dmsf_file, link, issue, controller)
                                                                                 dmsf_file.project)) || (!link &&
               User.current.allowed_to?(:file_delete, dmsf_file.project)))
               html << link_to('',
-                              link ? dmsf_link_path(link, commit: 'yes') : dmsf_file_path(id: dmsf_file, commit: 'yes'),
+                              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)),
                               data: { confirm: l(:text_are_you_sure) },
                               method: :delete,
                               title: l(:button_delete),

diff --git a/lib/redmine_dmsf/patches/notifiable_ru_patch.rb b/lib/redmine_dmsf/patches/notifiable_ru_patch.rb
@@ -48,6 +48,6 @@ def all_with_resources_dmsf
 end
 
 # Apply the patch
-if !defined?(EasyExtensions) && RedmineDmsf::Plugin.an_obsolete_plugin_present?
+if defined?(EasyExtensions) || RedmineDmsf::Plugin.an_obsolete_plugin_present?
   Redmine::Notifiable.include RedmineDmsf::Patches::NotifiableRuPatch
 end