Merge branch 'master' into devel-2.4.4

This commit is contained in:
karel.picman@lbcfree.net 2020-06-17 10:19:25 +02:00
commit 6062d69d27

View File

@ -56,9 +56,14 @@ module DmsfQueriesHelper
end
when :author
if value
link_to "#{item.firstname} #{item.lastname}", user_path(id: value)
user = User.find_by(id: value)
if user
link_to user.name, user_path(id: value)
else
super column, item, value
end
else
return super column, item, value
super column, item, value
end
when :title
if defined?(EasyExtensions)
@ -146,9 +151,14 @@ module DmsfQueriesHelper
when :workflow
DmsfWorkflow.workflow_str value.to_i
when :author
"#{object.firstname} #{object.lastname}"
else
super column, object, value
if value
user = User.find_by(id: value)
if user
user.name
else
super column, object, value
end
end
end
end