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