##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: 'assigned to me' filter broken....
Jean-Philippe Lang -
r966:e29539df9c2b
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,344 +1,342
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class QueryColumn
19 19 attr_accessor :name, :sortable
20 20 include GLoc
21 21
22 22 def initialize(name, options={})
23 23 self.name = name
24 24 self.sortable = options[:sortable]
25 25 end
26 26
27 27 def caption
28 28 set_language_if_valid(User.current.language)
29 29 l("field_#{name}")
30 30 end
31 31 end
32 32
33 33 class QueryCustomFieldColumn < QueryColumn
34 34
35 35 def initialize(custom_field)
36 36 self.name = "cf_#{custom_field.id}".to_sym
37 37 self.sortable = false
38 38 @cf = custom_field
39 39 end
40 40
41 41 def caption
42 42 @cf.name
43 43 end
44 44
45 45 def custom_field
46 46 @cf
47 47 end
48 48 end
49 49
50 50 class Query < ActiveRecord::Base
51 51 belongs_to :project
52 52 belongs_to :user
53 53 serialize :filters
54 54 serialize :column_names
55 55
56 56 attr_protected :project, :user
57 attr_accessor :executed_by
58 57
59 58 validates_presence_of :name, :on => :save
60 59 validates_length_of :name, :maximum => 255
61 60
62 61 @@operators = { "=" => :label_equals,
63 62 "!" => :label_not_equals,
64 63 "o" => :label_open_issues,
65 64 "c" => :label_closed_issues,
66 65 "!*" => :label_none,
67 66 "*" => :label_all,
68 67 ">=" => '>=',
69 68 "<=" => '<=',
70 69 "<t+" => :label_in_less_than,
71 70 ">t+" => :label_in_more_than,
72 71 "t+" => :label_in,
73 72 "t" => :label_today,
74 73 "w" => :label_this_week,
75 74 ">t-" => :label_less_than_ago,
76 75 "<t-" => :label_more_than_ago,
77 76 "t-" => :label_ago,
78 77 "~" => :label_contains,
79 78 "!~" => :label_not_contains }
80 79
81 80 cattr_reader :operators
82 81
83 82 @@operators_by_filter_type = { :list => [ "=", "!" ],
84 83 :list_status => [ "o", "=", "!", "c", "*" ],
85 84 :list_optional => [ "=", "!", "!*", "*" ],
86 85 :list_one_or_more => [ "*", "=" ],
87 86 :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
88 87 :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
89 88 :string => [ "=", "~", "!", "!~" ],
90 89 :text => [ "~", "!~" ],
91 90 :integer => [ "=", ">=", "<=" ] }
92 91
93 92 cattr_reader :operators_by_filter_type
94 93
95 94 @@available_columns = [
96 95 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
97 96 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
98 97 QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position"),
99 98 QueryColumn.new(:subject),
100 99 QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
101 100 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
102 101 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
103 102 QueryColumn.new(:fixed_version),
104 103 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
105 104 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
106 105 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
107 106 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
108 107 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on"),
109 108 ]
110 109 cattr_reader :available_columns
111 110
112 111 def initialize(attributes = nil)
113 112 super attributes
114 113 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
115 @executed_by = User.current.logged? ? User.current : nil
116 set_language_if_valid(executed_by.language) if executed_by
114 set_language_if_valid(User.current.language)
117 115 end
118 116
119 117 def validate
120 118 filters.each_key do |field|
121 119 errors.add label_for(field), :activerecord_error_blank unless
122 120 # filter requires one or more values
123 121 (values_for(field) and !values_for(field).first.empty?) or
124 122 # filter doesn't require any value
125 123 ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
126 124 end if filters
127 125 end
128 126
129 127 def editable_by?(user)
130 128 return false unless user
131 129 return true if !is_public && self.user_id == user.id
132 130 is_public && user.allowed_to?(:manage_public_queries, project)
133 131 end
134 132
135 133 def available_filters
136 134 return @available_filters if @available_filters
137 135 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
138 136 "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
139 137 "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
140 138 "subject" => { :type => :text, :order => 8 },
141 139 "created_on" => { :type => :date_past, :order => 9 },
142 140 "updated_on" => { :type => :date_past, :order => 10 },
143 141 "start_date" => { :type => :date, :order => 11 },
144 142 "due_date" => { :type => :date, :order => 12 },
145 143 "done_ratio" => { :type => :integer, :order => 13 }}
146 144
147 145 user_values = []
148 user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
146 user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
149 147 if project
150 148 user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
151 elsif executed_by
149 else
152 150 # members of the user's projects
153 user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
151 user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
154 152 end
155 153 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
156 154 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
157 155
158 156 if project
159 157 # project specific filters
160 158 @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
161 159 @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
162 160 unless @project.active_children.empty?
163 161 @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
164 162 end
165 163 @project.all_custom_fields.select(&:is_filter?).each do |field|
166 164 case field.field_format
167 165 when "text"
168 166 options = { :type => :text, :order => 20 }
169 167 when "list"
170 168 options = { :type => :list_optional, :values => field.possible_values, :order => 20}
171 169 when "date"
172 170 options = { :type => :date, :order => 20 }
173 171 when "bool"
174 172 options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
175 173 else
176 174 options = { :type => :string, :order => 20 }
177 175 end
178 176 @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
179 177 end
180 178 # remove category filter if no category defined
181 179 @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
182 180 end
183 181 @available_filters
184 182 end
185 183
186 184 def add_filter(field, operator, values)
187 185 # values must be an array
188 186 return unless values and values.is_a? Array # and !values.first.empty?
189 187 # check if field is defined as an available filter
190 188 if available_filters.has_key? field
191 189 filter_options = available_filters[field]
192 190 # check if operator is allowed for that filter
193 191 #if @@operators_by_filter_type[filter_options[:type]].include? operator
194 192 # allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
195 193 # filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
196 194 #end
197 195 filters[field] = {:operator => operator, :values => values }
198 196 end
199 197 end
200 198
201 199 def add_short_filter(field, expression)
202 200 return unless expression
203 201 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
204 202 add_filter field, (parms[0] || "="), [parms[1] || ""]
205 203 end
206 204
207 205 def has_filter?(field)
208 206 filters and filters[field]
209 207 end
210 208
211 209 def operator_for(field)
212 210 has_filter?(field) ? filters[field][:operator] : nil
213 211 end
214 212
215 213 def values_for(field)
216 214 has_filter?(field) ? filters[field][:values] : nil
217 215 end
218 216
219 217 def label_for(field)
220 218 label = @available_filters[field][:name] if @available_filters.has_key?(field)
221 219 label ||= field.gsub(/\_id$/, "")
222 220 end
223 221
224 222 def available_columns
225 223 return @available_columns if @available_columns
226 224 @available_columns = Query.available_columns
227 225 @available_columns += (project ?
228 226 project.custom_fields :
229 227 IssueCustomField.find(:all, :conditions => {:is_for_all => true})
230 228 ).collect {|cf| QueryCustomFieldColumn.new(cf) }
231 229 end
232 230
233 231 def columns
234 232 if has_default_columns?
235 233 available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
236 234 else
237 235 # preserve the column_names order
238 236 column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
239 237 end
240 238 end
241 239
242 240 def column_names=(names)
243 241 names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
244 242 names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
245 243 write_attribute(:column_names, names)
246 244 end
247 245
248 246 def has_column?(column)
249 247 column_names && column_names.include?(column.name)
250 248 end
251 249
252 250 def has_default_columns?
253 251 column_names.nil? || column_names.empty?
254 252 end
255 253
256 254 def statement
257 255 # project/subprojects clause
258 256 clause = ''
259 257 if project && has_filter?("subproject_id")
260 258 subproject_ids = []
261 259 if operator_for("subproject_id") == "="
262 260 subproject_ids = values_for("subproject_id").each(&:to_i)
263 261 else
264 262 subproject_ids = project.active_children.collect{|p| p.id}
265 263 end
266 264 clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
267 265 elsif project
268 266 clause << "#{Issue.table_name}.project_id=%d" % project.id
269 267 else
270 clause << Project.visible_by(executed_by)
268 clause << Project.visible_by(User.current)
271 269 end
272 270
273 271 # filters clauses
274 272 filters_clauses = []
275 273 filters.each_key do |field|
276 274 next if field == "subproject_id"
277 275 v = values_for(field).clone
278 276 next unless v and !v.empty?
279 277
280 278 sql = ''
281 279 if field =~ /^cf_(\d+)$/
282 280 # custom field
283 281 db_table = CustomValue.table_name
284 282 db_field = 'value'
285 283 sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "
286 284 else
287 285 # regular field
288 286 db_table = Issue.table_name
289 287 db_field = field
290 288 sql << '('
291 289 end
292 290
293 291 # "me" value subsitution
294 292 if %w(assigned_to_id author_id).include?(field)
295 v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")
293 v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
296 294 end
297 295
298 296 case operator_for field
299 297 when "="
300 298 sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
301 299 when "!"
302 300 sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
303 301 when "!*"
304 302 sql = sql + "#{db_table}.#{db_field} IS NULL"
305 303 when "*"
306 304 sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
307 305 when ">="
308 306 sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
309 307 when "<="
310 308 sql = sql + "#{db_table}.#{db_field} <= #{v.first.to_i}"
311 309 when "o"
312 310 sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
313 311 when "c"
314 312 sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
315 313 when ">t-"
316 314 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]
317 315 when "<t-"
318 316 sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
319 317 when "t-"
320 318 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]
321 319 when ">t+"
322 320 sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
323 321 when "<t+"
324 322 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
325 323 when "t+"
326 324 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
327 325 when "t"
328 326 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
329 327 when "w"
330 328 sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week.yesterday)]
331 329 when "~"
332 330 sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
333 331 when "!~"
334 332 sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
335 333 end
336 334 sql << ')'
337 335 filters_clauses << sql
338 336 end if filters and valid?
339 337
340 338 clause << ' AND ' unless clause.empty?
341 339 clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
342 340 clause
343 341 end
344 342 end
General Comments 0
You need to be logged in to leave comments. Login now