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

Attaching documents to issues - redesign

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-05-07 15:39:04 +02:00
parent 56632a1bc0
commit 5e934607cd
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,9 +32,11 @@ module RedmineDmsf
def view_attachments_form_top(context={})
html = ''
container = context[:container]
description = defined?(EasyExtensions) && EasySetting.value('attachment_description')
# Radio buttons
if allowed_to_attach_documents(context[:container])
html << '<p>'
if allowed_to_attach_documents(container) && allowed_to_attach_attachments(container)
html << (description ? '<p' : '<div')
classes = +'inline'
html << "<label class=\"#{classes}\">"
html << radio_button_tag('dmsf_attachments_upload_choice', 'Attachments',
@ -42,7 +44,7 @@ module RedmineDmsf
onchange: "$('.attachments-container:not(.dmsf-uploader)').show(); $('.dmsf-uploader').parent().hide(); return false;")
html << l(:label_basic_attachments)
html << '</label>'
unless context[:container] && context[:container].new_record?
unless container && container.new_record?
classes << ' dmsf_attachments_label'
end
html << "<label class=\"#{classes}\">"
@ -51,14 +53,19 @@ module RedmineDmsf
onchange: "$('.attachments-container:not(.dmsf-uploader)').hide(); $('.dmsf-uploader').parent().show(); return false;")
html << l(:label_dmsf_attachments)
html << '</label>'
html << '</p>'
html << (description ? '</p>' : '</div>')
if User.current.pref.dmsf_attachments_upload_choice == 'DMSF'
html << context[:hook_caller].late_javascript_tag("$('.attachments-container:not(.dmsf-uploader)').hide();")
end
end
# Upload form
html.html_safe + attach_documents_form(context, false,
defined?(EasyExtensions) && EasySetting.value('attachment_description'))
if allowed_to_attach_documents(container)
html << attach_documents_form(context, false, description)
end
unless allowed_to_attach_attachments(container)
html << context[:hook_caller].late_javascript_tag("$('.attachments-container:not(.dmsf-uploader)').hide();")
end
html.html_safe
end
def view_issues_show_description_bottom(context={})
@ -93,8 +100,8 @@ module RedmineDmsf
end
def view_issues_edit_notes_bottom_style(context={})
if (User.current.pref.dmsf_attachments_upload_choice == 'Attachments') ||
!allowed_to_attach_documents(context[:container])
if ((User.current.pref.dmsf_attachments_upload_choice == 'Attachments') ||
!allowed_to_attach_documents(context[:container])) && allowed_to_attach_attachments(context[:container])
''
else
'display: none'
@ -110,6 +117,13 @@ module RedmineDmsf
(container.project.dmsf_act_as_attachable == Project::ATTACHABLE_DMS_AND_ATTACHMENTS)
end
def allowed_to_attach_attachments(container)
unless defined?(EasyExtensions)
true
end
container.project && container.project.module_enabled?(:documents)
end
def get_links(container)
links = []
if defined?(container.dmsf_files) && User.current.allowed_to?(:view_dmsf_files, container.project) &&
@ -148,7 +162,7 @@ module RedmineDmsf
container = context[:container]
if allowed_to_attach_documents(container)
html = (description ? '<p' : '<div')
html << " style=\"#{(User.current.pref.dmsf_attachments_upload_choice == 'Attachments') ? 'display: none;' : ''}\">"
html << " style=\"#{(User.current.pref.dmsf_attachments_upload_choice == 'Attachments') && allowed_to_attach_attachments(container) ? 'display: none;' : ''}\">"
if label
html << "<label>#{l(:label_document_plural)}</label>"
html << "<span class=\"attachments-container dmsf-uploader\">"