| @@ -129,14 +129,11 module IssuesHelper | |||||
| 129 |
|
129 | |||
| 130 | def sidebar_queries |
|
130 | def sidebar_queries | |
| 131 | unless @sidebar_queries |
|
131 | unless @sidebar_queries | |
| 132 | # User can see public queries and his own queries |
|
132 | @sidebar_queries = Query.visible.all( | |
| 133 | visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)]) |
|
133 | :order => "#{Query.table_name}.name ASC", | |
| 134 | # Project specific queries and global queries |
|
134 | # Project specific queries and global queries | |
| 135 |
|
|
135 | :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]) | |
| 136 | @sidebar_queries = Query.find(:all, |
|
136 | ) | |
| 137 | :select => 'id, name, is_public', |
|
|||
| 138 | :order => "name ASC", |
|
|||
| 139 | :conditions => visible.conditions) |
|
|||
| 140 | end |
|
137 | end | |
| 141 | @sidebar_queries |
|
138 | @sidebar_queries | |
| 142 | end |
|
139 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now