##// END OF EJS Templates
Fixed: Incorrect filtering for unset values when using 'is not' filter....
Jean-Philippe Lang -
r1084:2247700f24ae
parent child
Show More
@@ -1,345 +1,345
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_id, :user_id
57 57
58 58 validates_presence_of :name, :on => :save
59 59 validates_length_of :name, :maximum => 255
60 60
61 61 @@operators = { "=" => :label_equals,
62 62 "!" => :label_not_equals,
63 63 "o" => :label_open_issues,
64 64 "c" => :label_closed_issues,
65 65 "!*" => :label_none,
66 66 "*" => :label_all,
67 67 ">=" => '>=',
68 68 "<=" => '<=',
69 69 "<t+" => :label_in_less_than,
70 70 ">t+" => :label_in_more_than,
71 71 "t+" => :label_in,
72 72 "t" => :label_today,
73 73 "w" => :label_this_week,
74 74 ">t-" => :label_less_than_ago,
75 75 "<t-" => :label_more_than_ago,
76 76 "t-" => :label_ago,
77 77 "~" => :label_contains,
78 78 "!~" => :label_not_contains }
79 79
80 80 cattr_reader :operators
81 81
82 82 @@operators_by_filter_type = { :list => [ "=", "!" ],
83 83 :list_status => [ "o", "=", "!", "c", "*" ],
84 84 :list_optional => [ "=", "!", "!*", "*" ],
85 85 :list_one_or_more => [ "*", "=" ],
86 86 :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
87 87 :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
88 88 :string => [ "=", "~", "!", "!~" ],
89 89 :text => [ "~", "!~" ],
90 90 :integer => [ "=", ">=", "<=" ] }
91 91
92 92 cattr_reader :operators_by_filter_type
93 93
94 94 @@available_columns = [
95 95 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
96 96 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
97 97 QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position"),
98 98 QueryColumn.new(:subject),
99 99 QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
100 100 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
101 101 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
102 102 QueryColumn.new(:fixed_version),
103 103 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
104 104 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
105 105 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
106 106 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
107 107 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on"),
108 108 ]
109 109 cattr_reader :available_columns
110 110
111 111 def initialize(attributes = nil)
112 112 super attributes
113 113 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
114 114 set_language_if_valid(User.current.language)
115 115 end
116 116
117 117 def validate
118 118 filters.each_key do |field|
119 119 errors.add label_for(field), :activerecord_error_blank unless
120 120 # filter requires one or more values
121 121 (values_for(field) and !values_for(field).first.empty?) or
122 122 # filter doesn't require any value
123 123 ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
124 124 end if filters
125 125 end
126 126
127 127 def editable_by?(user)
128 128 return false unless user
129 129 return true if !is_public && self.user_id == user.id
130 130 is_public && user.allowed_to?(:manage_public_queries, project)
131 131 end
132 132
133 133 def available_filters
134 134 return @available_filters if @available_filters
135 135
136 136 trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
137 137
138 138 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
139 139 "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },
140 140 "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
141 141 "subject" => { :type => :text, :order => 8 },
142 142 "created_on" => { :type => :date_past, :order => 9 },
143 143 "updated_on" => { :type => :date_past, :order => 10 },
144 144 "start_date" => { :type => :date, :order => 11 },
145 145 "due_date" => { :type => :date, :order => 12 },
146 146 "done_ratio" => { :type => :integer, :order => 13 }}
147 147
148 148 user_values = []
149 149 user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
150 150 if project
151 151 user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
152 152 else
153 153 # members of the user's projects
154 154 user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
155 155 end
156 156 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
157 157 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
158 158
159 159 if project
160 160 # project specific filters
161 161 @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
162 162 @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
163 163 unless @project.active_children.empty?
164 164 @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
165 165 end
166 166 @project.all_custom_fields.select(&:is_filter?).each do |field|
167 167 case field.field_format
168 168 when "text"
169 169 options = { :type => :text, :order => 20 }
170 170 when "list"
171 171 options = { :type => :list_optional, :values => field.possible_values, :order => 20}
172 172 when "date"
173 173 options = { :type => :date, :order => 20 }
174 174 when "bool"
175 175 options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
176 176 else
177 177 options = { :type => :string, :order => 20 }
178 178 end
179 179 @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
180 180 end
181 181 # remove category filter if no category defined
182 182 @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
183 183 end
184 184 @available_filters
185 185 end
186 186
187 187 def add_filter(field, operator, values)
188 188 # values must be an array
189 189 return unless values and values.is_a? Array # and !values.first.empty?
190 190 # check if field is defined as an available filter
191 191 if available_filters.has_key? field
192 192 filter_options = available_filters[field]
193 193 # check if operator is allowed for that filter
194 194 #if @@operators_by_filter_type[filter_options[:type]].include? operator
195 195 # allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
196 196 # filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
197 197 #end
198 198 filters[field] = {:operator => operator, :values => values }
199 199 end
200 200 end
201 201
202 202 def add_short_filter(field, expression)
203 203 return unless expression
204 204 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
205 205 add_filter field, (parms[0] || "="), [parms[1] || ""]
206 206 end
207 207
208 208 def has_filter?(field)
209 209 filters and filters[field]
210 210 end
211 211
212 212 def operator_for(field)
213 213 has_filter?(field) ? filters[field][:operator] : nil
214 214 end
215 215
216 216 def values_for(field)
217 217 has_filter?(field) ? filters[field][:values] : nil
218 218 end
219 219
220 220 def label_for(field)
221 221 label = @available_filters[field][:name] if @available_filters.has_key?(field)
222 222 label ||= field.gsub(/\_id$/, "")
223 223 end
224 224
225 225 def available_columns
226 226 return @available_columns if @available_columns
227 227 @available_columns = Query.available_columns
228 228 @available_columns += (project ?
229 229 project.all_custom_fields :
230 230 IssueCustomField.find(:all, :conditions => {:is_for_all => true})
231 231 ).collect {|cf| QueryCustomFieldColumn.new(cf) }
232 232 end
233 233
234 234 def columns
235 235 if has_default_columns?
236 236 available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
237 237 else
238 238 # preserve the column_names order
239 239 column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
240 240 end
241 241 end
242 242
243 243 def column_names=(names)
244 244 names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
245 245 names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
246 246 write_attribute(:column_names, names)
247 247 end
248 248
249 249 def has_column?(column)
250 250 column_names && column_names.include?(column.name)
251 251 end
252 252
253 253 def has_default_columns?
254 254 column_names.nil? || column_names.empty?
255 255 end
256 256
257 257 def statement
258 258 # project/subprojects clause
259 259 clause = ''
260 260 if project && has_filter?("subproject_id")
261 261 subproject_ids = []
262 262 if operator_for("subproject_id") == "="
263 263 subproject_ids = values_for("subproject_id").each(&:to_i)
264 264 else
265 265 subproject_ids = project.active_children.collect{|p| p.id}
266 266 end
267 267 clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
268 268 elsif project
269 269 clause << "#{Issue.table_name}.project_id=%d" % project.id
270 270 else
271 271 clause << Project.visible_by(User.current)
272 272 end
273 273
274 274 # filters clauses
275 275 filters_clauses = []
276 276 filters.each_key do |field|
277 277 next if field == "subproject_id"
278 278 v = values_for(field).clone
279 279 next unless v and !v.empty?
280 280
281 281 sql = ''
282 282 if field =~ /^cf_(\d+)$/
283 283 # custom field
284 284 db_table = CustomValue.table_name
285 285 db_field = 'value'
286 286 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 "
287 287 else
288 288 # regular field
289 289 db_table = Issue.table_name
290 290 db_field = field
291 291 sql << '('
292 292 end
293 293
294 294 # "me" value subsitution
295 295 if %w(assigned_to_id author_id).include?(field)
296 296 v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
297 297 end
298 298
299 299 case operator_for field
300 300 when "="
301 301 sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
302 302 when "!"
303 sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
303 sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
304 304 when "!*"
305 305 sql = sql + "#{db_table}.#{db_field} IS NULL"
306 306 when "*"
307 307 sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
308 308 when ">="
309 309 sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
310 310 when "<="
311 311 sql = sql + "#{db_table}.#{db_field} <= #{v.first.to_i}"
312 312 when "o"
313 313 sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
314 314 when "c"
315 315 sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
316 316 when ">t-"
317 317 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)]
318 318 when "<t-"
319 319 sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
320 320 when "t-"
321 321 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)]
322 322 when ">t+"
323 323 sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
324 324 when "<t+"
325 325 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)]
326 326 when "t+"
327 327 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)]
328 328 when "t"
329 329 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)]
330 330 when "w"
331 331 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)]
332 332 when "~"
333 333 sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
334 334 when "!~"
335 335 sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
336 336 end
337 337 sql << ')'
338 338 filters_clauses << sql
339 339 end if filters and valid?
340 340
341 341 clause << ' AND ' unless clause.empty?
342 342 clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
343 343 clause
344 344 end
345 345 end
General Comments 0
You need to be logged in to leave comments. Login now