meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Rename "issue" to "item" in query helpers (#24643).

Browse Source 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16101 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-12-20 09:07:24 +00:00
parent f9823d1028
commit 2bcbb30546
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/helpers/queries_helper.rb
View File

@ -43,7 +43,7 @@ module QueriesHelper
end end
end end
# Don't group dates if there's only one (eg. time entries filters) # Don't group dates if there's only one (eg. time entries filters)
if grouped[:label_date].try(:size) == 1 if grouped[:label_date].try(:size) == 1
ungrouped << grouped.delete(:label_date).first ungrouped << grouped.delete(:label_date).first
end end
s = options_for_select([[]] + ungrouped) s = options_for_select([[]] + ungrouped)
@ -164,31 +164,31 @@ module QueriesHelper
content_tag('th', h(column.caption)) content_tag('th', h(column.caption))
end end
def column_content(column, issue) def column_content(column, item)
value = column.value_object(issue) value = column.value_object(item)
if value.is_a?(Array) if value.is_a?(Array)
value.collect {|v| column_value(column, issue, v)}.compact.join(', ').html_safe value.collect {|v| column_value(column, item, v)}.compact.join(', ').html_safe
else else
column_value(column, issue, value) column_value(column, item, value)
end end
end end
def column_value(column, issue, value) def column_value(column, item, value)
case column.name case column.name
when :id when :id
link_to value, issue_path(issue) link_to value, issue_path(item)
when :subject when :subject
link_to value, issue_path(issue) link_to value, issue_path(item)
when :parent when :parent
value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : '' value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : ''
when :description when :description
issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : '' item.description? ? content_tag('div', textilizable(item, :description), :class => "wiki") : ''
when :done_ratio when :done_ratio
progress_bar(value) progress_bar(value)
when :relations when :relations
content_tag('span', content_tag('span',
value.to_s(issue) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe, value.to_s(item) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
:class => value.css_classes_for(issue)) :class => value.css_classes_for(item))
when :hours, :spent_hours, :total_spent_hours, :estimated_hours when :hours, :spent_hours, :total_spent_hours, :estimated_hours
format_hours(value) format_hours(value)
else else
@ -196,12 +196,12 @@ module QueriesHelper
end end
end end
def csv_content(column, issue) def csv_content(column, item)
value = column.value_object(issue) value = column.value_object(item)
if value.is_a?(Array) if value.is_a?(Array)
value.collect {|v| csv_value(column, issue, v)}.compact.join(', ') value.collect {|v| csv_value(column, item, v)}.compact.join(', ')
else else
csv_value(column, issue, value) csv_value(column, item, value)
end end
end end