Redmine 4.1.7
This commit is contained in:
parent
55458d3479
commit
3ca3c37487
103 changed files with 2426 additions and 431 deletions
|
@ -217,6 +217,11 @@ module IssuesHelper
|
|||
if issue.total_spent_hours == issue.spent_hours
|
||||
link_to(l_hours_short(issue.spent_hours), path)
|
||||
else
|
||||
# link to global time entries if cross-project subtasks are allowed
|
||||
# in order to show time entries from not descendents projects
|
||||
if %w(system tree hierarchy).include?(Setting.cross_project_subtasks)
|
||||
path = time_entries_path(:issue_id => "~#{issue.id}")
|
||||
end
|
||||
s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
|
||||
s += " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), path})"
|
||||
s.html_safe
|
||||
|
@ -551,7 +556,7 @@ module IssuesHelper
|
|||
unless no_html
|
||||
diff_link =
|
||||
link_to(
|
||||
'diff',
|
||||
l(:label_diff),
|
||||
diff_journal_url(detail.journal_id, :detail_id => detail.id,
|
||||
:only_path => options[:only_path]),
|
||||
:title => l(:label_view_diff))
|
||||
|
@ -577,6 +582,7 @@ module IssuesHelper
|
|||
end
|
||||
|
||||
# Find the name of an associated record stored in the field attribute
|
||||
# For project, return the associated record only if is visible for the current User
|
||||
def find_name_by_reflection(field, id)
|
||||
return nil if id.blank?
|
||||
@detail_value_name_by_reflection ||= Hash.new do |hash, key|
|
||||
|
@ -584,7 +590,7 @@ module IssuesHelper
|
|||
name = nil
|
||||
if association
|
||||
record = association.klass.find_by_id(key.last)
|
||||
if record
|
||||
if (record && !record.is_a?(Project)) || (record.is_a?(Project) && record.visible?)
|
||||
name = record.name.force_encoding('UTF-8')
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue