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

Trouble with dmsff macro #1330

Browse Source
This commit is contained in:
Karel.Picman 2022-02-01 13:05:10 +01:00
parent 5e4d47a88e
commit 22ecb03f87
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/redmine_dmsf/macros.rb
View File

@ -58,7 +58,11 @@ Redmine::WikiFormatting::Macros.register do
"_folder_id_ can be found in the link for folder opening. Without arguments return link to main folder 'Documents'" "_folder_id_ can be found in the link for folder opening. Without arguments return link to main folder 'Documents'"
macro :dmsff do |obj, args| macro :dmsff do |obj, args|
if args.length < 1 if args.length < 1
return link_to l(:link_documents), dmsf_folder_url(@project) if User.current.allowed_to?(:view_dmsf_folders, @project) && @project.module_enabled?(:dmsf)
return link_to l(:link_documents), dmsf_folder_url(@project)
else
raise l(:notice_not_authorized)
end
else else
folder = DmsfFolder.visible.find args[0].strip folder = DmsfFolder.visible.find args[0].strip
if User.current && User.current.allowed_to?(:view_dmsf_folders, folder.project) if User.current && User.current.allowed_to?(:view_dmsf_folders, folder.project)
@ -66,8 +70,7 @@ Redmine::WikiFormatting::Macros.register do
title.gsub!(/\A"|"\z/,'') # Remove apostrophes title.gsub!(/\A"|"\z/,'') # Remove apostrophes
title.gsub!(/\A'|'\z/,'') title.gsub!(/\A'|'\z/,'')
title = folder.title if title.empty? title = folder.title if title.empty?
return link_to h(title), return link_to h(title), dmsf_folder_url(folder.project, folder_id: folder)
dmsf_folder_url(folder.project, folder_id: folder)
else else
raise l(:notice_not_authorized) raise l(:notice_not_authorized)
end end