@@ -43,7 +43,7 module QueriesHelper | |||||
43 | end |
|
43 | end | |
44 | end |
|
44 | end | |
45 | # Don't group dates if there's only one (eg. time entries filters) |
|
45 | # Don't group dates if there's only one (eg. time entries filters) | |
46 |
if grouped[:label_date].try(:size) == 1 |
|
46 | if grouped[:label_date].try(:size) == 1 | |
47 | ungrouped << grouped.delete(:label_date).first |
|
47 | ungrouped << grouped.delete(:label_date).first | |
48 | end |
|
48 | end | |
49 | s = options_for_select([[]] + ungrouped) |
|
49 | s = options_for_select([[]] + ungrouped) | |
@@ -164,31 +164,31 module QueriesHelper | |||||
164 | content_tag('th', h(column.caption)) |
|
164 | content_tag('th', h(column.caption)) | |
165 | end |
|
165 | end | |
166 |
|
166 | |||
167 |
def column_content(column, i |
|
167 | def column_content(column, item) | |
168 |
value = column.value_object(i |
|
168 | value = column.value_object(item) | |
169 | if value.is_a?(Array) |
|
169 | if value.is_a?(Array) | |
170 |
value.collect {|v| column_value(column, i |
|
170 | value.collect {|v| column_value(column, item, v)}.compact.join(', ').html_safe | |
171 | else |
|
171 | else | |
172 |
column_value(column, i |
|
172 | column_value(column, item, value) | |
173 | end |
|
173 | end | |
174 | end |
|
174 | end | |
175 |
|
175 | |||
176 |
def column_value(column, i |
|
176 | def column_value(column, item, value) | |
177 | case column.name |
|
177 | case column.name | |
178 | when :id |
|
178 | when :id | |
179 |
link_to value, issue_path(i |
|
179 | link_to value, issue_path(item) | |
180 | when :subject |
|
180 | when :subject | |
181 |
link_to value, issue_path(i |
|
181 | link_to value, issue_path(item) | |
182 | when :parent |
|
182 | when :parent | |
183 | value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : '' |
|
183 | value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : '' | |
184 | when :description |
|
184 | when :description | |
185 |
i |
|
185 | item.description? ? content_tag('div', textilizable(item, :description), :class => "wiki") : '' | |
186 | when :done_ratio |
|
186 | when :done_ratio | |
187 | progress_bar(value) |
|
187 | progress_bar(value) | |
188 | when :relations |
|
188 | when :relations | |
189 | content_tag('span', |
|
189 | content_tag('span', | |
190 |
value.to_s(i |
|
190 | value.to_s(item) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe, | |
191 |
:class => value.css_classes_for(i |
|
191 | :class => value.css_classes_for(item)) | |
192 | when :hours, :spent_hours, :total_spent_hours, :estimated_hours |
|
192 | when :hours, :spent_hours, :total_spent_hours, :estimated_hours | |
193 | format_hours(value) |
|
193 | format_hours(value) | |
194 | else |
|
194 | else | |
@@ -196,12 +196,12 module QueriesHelper | |||||
196 | end |
|
196 | end | |
197 | end |
|
197 | end | |
198 |
|
198 | |||
199 |
def csv_content(column, i |
|
199 | def csv_content(column, item) | |
200 |
value = column.value_object(i |
|
200 | value = column.value_object(item) | |
201 | if value.is_a?(Array) |
|
201 | if value.is_a?(Array) | |
202 |
value.collect {|v| csv_value(column, i |
|
202 | value.collect {|v| csv_value(column, item, v)}.compact.join(', ') | |
203 | else |
|
203 | else | |
204 |
csv_value(column, i |
|
204 | csv_value(column, item, value) | |
205 | end |
|
205 | end | |
206 | end |
|
206 | end | |
207 |
|
207 |
General Comments 0
You need to be logged in to leave comments.
Login now