##// END OF EJS Templates
Merged r3409 from trunk....
Jean-Philippe Lang -
r3350:13fb739b5620
parent child
Show More
@@ -210,6 +210,10 class Query < ActiveRecord::Base
210 add_custom_fields_filters(@project.all_issue_custom_fields)
210 add_custom_fields_filters(@project.all_issue_custom_fields)
211 else
211 else
212 # global filters for cross project issue list
212 # global filters for cross project issue list
213 system_shared_versions = Version.visible.find_all_by_sharing('system')
214 unless system_shared_versions.empty?
215 @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => system_shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
216 end
213 add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
217 add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
214 end
218 end
215 @available_filters
219 @available_filters
@@ -26,6 +26,13 class QueryTest < ActiveSupport::TestCase
26 assert !query.available_filters.has_key?('cf_3')
26 assert !query.available_filters.has_key?('cf_3')
27 end
27 end
28
28
29 def test_system_shared_versions_should_be_available_in_global_queries
30 Version.find(2).update_attribute :sharing, 'system'
31 query = Query.new(:project => nil, :name => '_')
32 assert query.available_filters.has_key?('fixed_version_id')
33 assert query.available_filters['fixed_version_id'][:values].detect {|v| v.last == '2'}
34 end
35
29 def find_issues_with_query(query)
36 def find_issues_with_query(query)
30 Issue.find :all,
37 Issue.find :all,
31 :include => [ :assigned_to, :status, :tracker, :project, :priority ],
38 :include => [ :assigned_to, :status, :tracker, :project, :priority ],
General Comments 0
You need to be logged in to leave comments. Login now