| @@ -279,14 +279,7 module QueriesHelper | |||
|
|
279 | 279 | end |
|
|
280 | 280 | |
|
|
281 | 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 | |
|
|
282 | @sidebar_queries ||= IssueQuery.visible.global_or_on_project(@project).sorted.to_a | |
|
|
290 | 283 | end |
|
|
291 | 284 | |
|
|
292 | 285 | def query_links(title, queries) |
| @@ -234,6 +234,13 class Query < ActiveRecord::Base | |||
|
|
234 | 234 | # Permission required to view the queries, set on subclasses. |
|
|
235 | 235 | class_attribute :view_permission |
|
|
236 | 236 | |
|
|
237 | # Scope of queries that are global or on the given project | |
|
|
238 | scope :global_or_on_project, lambda {|project| | |
|
|
239 | where(:project_id => (project.nil? ? nil : [nil, project.id])) | |
|
|
240 | } | |
|
|
241 | ||
|
|
242 | scope :sorted, lambda {order(:name, :id)} | |
|
|
243 | ||
|
|
237 | 244 | # Scope of visible queries, can be used from subclasses only. |
|
|
238 | 245 | # Unlike other visible scopes, a class methods is used as it |
|
|
239 | 246 | # let handle inheritance more nicely than scope DSL. |
General Comments 0
You need to be logged in to leave comments.
Login now