@@ -266,21 +266,21 class Query < ActiveRecord::Base | |||||
266 |
|
266 | |||
267 | if project |
|
267 | if project | |
268 | # project specific filters |
|
268 | # project specific filters | |
269 |
categories = |
|
269 | categories = project.issue_categories.all | |
270 | unless categories.empty? |
|
270 | unless categories.empty? | |
271 | @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => categories.collect{|s| [s.name, s.id.to_s] } } |
|
271 | @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => categories.collect{|s| [s.name, s.id.to_s] } } | |
272 | end |
|
272 | end | |
273 |
versions = |
|
273 | versions = project.shared_versions.all | |
274 | unless versions.empty? |
|
274 | unless versions.empty? | |
275 | @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } } |
|
275 | @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } } | |
276 | end |
|
276 | end | |
277 |
unless |
|
277 | unless project.leaf? | |
278 |
subprojects = |
|
278 | subprojects = project.descendants.visible.all | |
279 | unless subprojects.empty? |
|
279 | unless subprojects.empty? | |
280 | @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } } |
|
280 | @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } } | |
281 | end |
|
281 | end | |
282 | end |
|
282 | end | |
283 |
add_custom_fields_filters( |
|
283 | add_custom_fields_filters(project.all_issue_custom_fields) | |
284 | else |
|
284 | else | |
285 | # global filters for cross project issue list |
|
285 | # global filters for cross project issue list | |
286 | system_shared_versions = Version.visible.find_all_by_sharing('system') |
|
286 | system_shared_versions = Version.visible.find_all_by_sharing('system') | |
@@ -460,7 +460,7 class Query < ActiveRecord::Base | |||||
460 |
|
460 | |||
461 | def project_statement |
|
461 | def project_statement | |
462 | project_clauses = [] |
|
462 | project_clauses = [] | |
463 |
if project && ! |
|
463 | if project && !project.descendants.active.empty? | |
464 | ids = [project.id] |
|
464 | ids = [project.id] | |
465 | if has_filter?("subproject_id") |
|
465 | if has_filter?("subproject_id") | |
466 | case operator_for("subproject_id") |
|
466 | case operator_for("subproject_id") |
General Comments 0
You need to be logged in to leave comments.
Login now