Merged r16467 (#25501).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16505 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 1 insertions, 5 deletions

diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index 01302cfb0..42d6df40f 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -236,7 +236,6 @@ class IssueQuery < Query
     end
 
     add_custom_fields_filters(issue_custom_fields)
-
     add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
 
     IssueRelation::TYPES.each do |relation_type, options|
@@ -255,10 +254,7 @@ class IssueQuery < Query
   def available_columns
     return @available_columns if @available_columns
     @available_columns = self.class.available_columns.dup
-    @available_columns += (project ?
-                            project.all_issue_custom_fields :
-                            IssueCustomField
-                           ).visible.collect {|cf| QueryCustomFieldColumn.new(cf) }
+    @available_columns += issue_custom_fields.visible.collect {|cf| QueryCustomFieldColumn.new(cf) }
 
     if User.current.allowed_to?(:view_time_entries, project, :global => true)
       index = @available_columns.find_index {|column| column.name == :total_estimated_hours}