| @@ -216,14 +216,19 class Query < ActiveRecord::Base | |||||
| 216 |
|
216 | |||
| 217 | if project |
|
217 | if project | |
| 218 | # project specific filters |
|
218 | # project specific filters | |
| 219 |
|
|
219 | categories = @project.issue_categories.all | |
| 220 | @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } } |
|
220 | unless categories.empty? | |
|
|
221 | @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => categories.collect{|s| [s.name, s.id.to_s] } } | |||
| 221 | end |
|
222 | end | |
| 222 |
|
|
223 | versions = @project.shared_versions.all | |
| 223 | @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } } |
|
224 | unless versions.empty? | |
|
|
225 | @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } } | |||
| 224 | end |
|
226 | end | |
| 225 |
unless @project. |
|
227 | unless @project.leaf? | |
| 226 | @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.descendants.visible.collect{|s| [s.name, s.id.to_s] } } |
|
228 | subprojects = @project.descendants.visible.all | |
|
|
229 | unless subprojects.empty? | |||
|
|
230 | @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } } | |||
|
|
231 | end | |||
| 227 | end |
|
232 | end | |
| 228 | add_custom_fields_filters(@project.all_issue_custom_fields) |
|
233 | add_custom_fields_filters(@project.all_issue_custom_fields) | |
| 229 | else |
|
234 | else | |
General Comments 0
You need to be logged in to leave comments.
Login now