5.1 Documents management
- The documents are stored in folders, which should have such a structure that provides an easy orientation within - the topic. + The documents are stored in folders, which should have such a structure that provides an easy orientation within the topic.
@@ -411,14 +405,14 @@
5.11 Add documents
Click on the green plus icon New document in the top right of the main view. Then you can use the - Browse button or simple drag and drop files into the drop-able area. Multiple files can be selected. + Browse button or simple drag and drop files into the drop-able area. Multiple files (max 10) can be selected.
Recently uploaded files ar listed on the screen. You can delete them, if they were selected by mistake using the trash bin icon. When done, click the Uplad button.
- If you use [+] icon, you can specify document's details and then you can directly use Upload an commit button. + If you use [+] icon, you can specify document's details and then you can directly use Upload and commit button. In that case the following commit screeen will be skipped and uploaded documents will be directly stored.
', { id: 'dmsf_attachments_' + attachmentId, 'class': 'attachment' });
diff --git a/init.rb b/init.rb
index f100c1e8..06e15c2f 100644
--- a/init.rb
+++ b/init.rb
@@ -24,7 +24,7 @@ Redmine::Plugin.register :redmine_dmsf do
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
index 33babe90..c6e6eb41 100644
--- a/lib/redmine_dmsf.rb
+++ b/lib/redmine_dmsf.rb
@@ -42,7 +42,7 @@ require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/search_patch"
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
index a01c1ea2..67cde1ff 100644
--- a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
+++ b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
@@ -275,7 +275,7 @@ module RedmineDmsf
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
index e5047569..9d3f011f 100644
--- a/lib/redmine_dmsf/patches/notifiable_ru_patch.rb
+++ b/lib/redmine_dmsf/patches/notifiable_ru_patch.rb
@@ -48,6 +48,6 @@ module RedmineDmsf
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