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