##// END OF EJS Templates
Use IssueRelation#to_s....
Jean-Philippe Lang -
r13183:4d6c52a82b44
parent child
Show More
@@ -104,9 +104,8 module QueriesHelper
104 when :done_ratio
104 when :done_ratio
105 progress_bar(value, :width => '80px')
105 progress_bar(value, :width => '80px')
106 when :relations
106 when :relations
107 other = value.other_issue(issue)
108 content_tag('span',
107 content_tag('span',
109 (l(value.label_for(issue)) + " " + link_to_issue(other, :subject => false, :tracker => false)).html_safe,
108 value.to_s(issue) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
110 :class => value.css_classes_for(issue))
109 :class => value.css_classes_for(issue))
111 else
110 else
112 format_object(value)
111 format_object(value)
@@ -128,8 +127,7 module QueriesHelper
128 when 'Float'
127 when 'Float'
129 sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
128 sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
130 when 'IssueRelation'
129 when 'IssueRelation'
131 other = value.other_issue(object)
130 value.to_s(object)
132 l(value.label_for(object)) + " ##{other.id}"
133 when 'Issue'
131 when 'Issue'
134 if object.is_a?(TimeEntry)
132 if object.is_a?(TimeEntry)
135 "#{value.tracker} ##{value.id}: #{value.subject}"
133 "#{value.tracker} ##{value.id}: #{value.subject}"
@@ -26,7 +26,7 class IssueRelation < ActiveRecord::Base
26 end
26 end
27
27
28 def to_s(*args)
28 def to_s(*args)
29 map {|relation| "#{l(relation.label_for(@issue))} ##{relation.other_issue(@issue).id}"}.join(', ')
29 map {|relation| relation.to_s(@issue)}.join(', ')
30 end
30 end
31 end
31 end
32
32
General Comments 0
You need to be logged in to leave comments. Login now