redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Karel Pičman 2024-10-24 07:54:50 +02:00
commit 3f1d1f5cfc
8 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,6 +1,14 @@
Changelog for Redmine DMSF 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* 3.2.3 *2024-10-18*
------------------ ------------------

2
README.md
View File

@ -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) [![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)

14
assets/help/en/dmsf_help.html
View File

File diff suppressed because one or more lines are too long

2
assets/javascripts/attachments_dmsf.js
View File

@ -152,7 +152,7 @@ function dmsfAddFile(inputEl, file, eagerUpload) {
let attachments = $('#dmsf_attachments_fields'); let attachments = $('#dmsf_attachments_fields');
let max = ($(inputEl).attr('multiple') == 'multiple') ? 10 : 1 let max = ($(inputEl).attr('multiple') == 'multiple') ? 10 : 1
if (attachments.children().length < max) { if (attachments.children('.attachment').length < max) {
let attachmentId = dmsfAddFile.nextAttachmentId++; let attachmentId = dmsfAddFile.nextAttachmentId++;
let fileSpan = $('<span>', { id: 'dmsf_attachments_' + attachmentId, 'class': 'attachment' }); let fileSpan = $('<span>', { id: 'dmsf_attachments_' + attachmentId, 'class': 'attachment' });

2
init.rb
View File

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

2
lib/redmine_dmsf.rb
View File

@ -42,7 +42,7 @@ require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/search_patch"
require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/custom_field_patch" require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/custom_field_patch"
# A workaround for obsolete 'alias_method' usage in RedmineUp's plugins # 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" require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_ru_patch"
else else
require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_patch" require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_patch"

2
lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
View File

@ -275,7 +275,7 @@ module RedmineDmsf
dmsf_file.project)) || (!link && dmsf_file.project)) || (!link &&
User.current.allowed_to?(:file_delete, dmsf_file.project))) User.current.allowed_to?(:file_delete, dmsf_file.project)))
html << link_to('', 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) }, data: { confirm: l(:text_are_you_sure) },
method: :delete, method: :delete,
title: l(:button_delete), title: l(:button_delete),

2
lib/redmine_dmsf/patches/notifiable_ru_patch.rb
View File

@ -48,6 +48,6 @@ module RedmineDmsf
end end
# Apply the patch # 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 Redmine::Notifiable.include RedmineDmsf::Patches::NotifiableRuPatch
end end