| @@ -126,10 +126,10 class Query < ActiveRecord::Base | |||||
| 126 | "done_ratio" => { :type => :integer, :order => 13 }} |
|
126 | "done_ratio" => { :type => :integer, :order => 13 }} | |
| 127 |
|
127 | |||
| 128 | user_values = [] |
|
128 | user_values = [] | |
|
|
129 | user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by | |||
| 129 | if project |
|
130 | if project | |
| 130 | user_values += project.users.collect{|s| [s.name, s.id.to_s] } |
|
131 | user_values += project.users.collect{|s| [s.name, s.id.to_s] } | |
| 131 | elsif executed_by |
|
132 | elsif executed_by | |
| 132 | user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by |
|
|||
| 133 | # members of the user's projects |
|
133 | # members of the user's projects | |
| 134 | user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] } |
|
134 | user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] } | |
| 135 | end |
|
135 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now