| @@ -276,40 +276,6 module IssuesHelper | |||||
| 276 | users |
|
276 | users | |
| 277 | end |
|
277 | end | |
| 278 |
|
278 | |||
| 279 | def sidebar_queries |
|
|||
| 280 | unless @sidebar_queries |
|
|||
| 281 | @sidebar_queries = IssueQuery.visible. |
|
|||
| 282 | order("#{Query.table_name}.name ASC"). |
|
|||
| 283 | # Project specific queries and global queries |
|
|||
| 284 | where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]). |
|
|||
| 285 | to_a |
|
|||
| 286 | end |
|
|||
| 287 | @sidebar_queries |
|
|||
| 288 | end |
|
|||
| 289 |
|
||||
| 290 | def query_links(title, queries) |
|
|||
| 291 | return '' if queries.empty? |
|
|||
| 292 | # links to #index on issues/show |
|
|||
| 293 | url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : {} |
|
|||
| 294 |
|
||||
| 295 | content_tag('h3', title) + "\n" + |
|
|||
| 296 | content_tag('ul', |
|
|||
| 297 | queries.collect {|query| |
|
|||
| 298 | css = 'query' |
|
|||
| 299 | css << ' selected' if query == @query |
|
|||
| 300 | content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css)) |
|
|||
| 301 | }.join("\n").html_safe, |
|
|||
| 302 | :class => 'queries' |
|
|||
| 303 | ) + "\n" |
|
|||
| 304 | end |
|
|||
| 305 |
|
||||
| 306 | def render_sidebar_queries |
|
|||
| 307 | out = ''.html_safe |
|
|||
| 308 | out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?)) |
|
|||
| 309 | out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?)) |
|
|||
| 310 | out |
|
|||
| 311 | end |
|
|||
| 312 |
|
||||
| 313 | def email_issue_attributes(issue, user) |
|
279 | def email_issue_attributes(issue, user) | |
| 314 | items = [] |
|
280 | items = [] | |
| 315 | %w(author status priority assigned_to category fixed_version).each do |attribute| |
|
281 | %w(author status priority assigned_to category fixed_version).each do |attribute| | |
| @@ -277,4 +277,38 module QueriesHelper | |||||
| 277 |
|
277 | |||
| 278 | tags |
|
278 | tags | |
| 279 | end |
|
279 | end | |
|
|
280 | ||||
|
|
281 | def sidebar_queries | |||
|
|
282 | unless @sidebar_queries | |||
|
|
283 | @sidebar_queries = IssueQuery.visible. | |||
|
|
284 | order("#{Query.table_name}.name ASC"). | |||
|
|
285 | # Project specific queries and global queries | |||
|
|
286 | where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]). | |||
|
|
287 | to_a | |||
|
|
288 | end | |||
|
|
289 | @sidebar_queries | |||
|
|
290 | end | |||
|
|
291 | ||||
|
|
292 | def query_links(title, queries) | |||
|
|
293 | return '' if queries.empty? | |||
|
|
294 | # links to #index on issues/show | |||
|
|
295 | url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : {} | |||
|
|
296 | ||||
|
|
297 | content_tag('h3', title) + "\n" + | |||
|
|
298 | content_tag('ul', | |||
|
|
299 | queries.collect {|query| | |||
|
|
300 | css = 'query' | |||
|
|
301 | css << ' selected' if query == @query | |||
|
|
302 | content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css)) | |||
|
|
303 | }.join("\n").html_safe, | |||
|
|
304 | :class => 'queries' | |||
|
|
305 | ) + "\n" | |||
|
|
306 | end | |||
|
|
307 | ||||
|
|
308 | def render_sidebar_queries | |||
|
|
309 | out = ''.html_safe | |||
|
|
310 | out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?)) | |||
|
|
311 | out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?)) | |||
|
|
312 | out | |||
|
|
313 | end | |||
| 280 | end |
|
314 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now