Don't preload all query filters (#24787).

git-svn-id: http://svn.redmine.org/redmine/trunk@16170 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 20 insertions, 1 deletions

diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index fda9d9711..f7ef74882 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -17,7 +17,7 @@
 
 class QueriesController < ApplicationController
   menu_item :issues
-  before_action :find_query, :except => [:new, :create, :index]
+  before_action :find_query, :only => [:edit, :update, :destroy]
   before_action :find_optional_project, :only => [:new, :create]
 
   accept_api_auth :index
@@ -85,6 +85,25 @@ class QueriesController < ApplicationController
     redirect_to_items(:set_filter => 1)
   end
 
+  # Returns the values for a query filter
+  def filter
+    q = query_class.new
+    if params[:project_id].present?
+      q.project = Project.find(params[:project_id])
+    end
+
+    unless User.current.allowed_to?(q.class.view_permission, q.project, :global => true)
+      raise Unauthorized
+    end
+
+    filter = q.available_filters[params[:name].to_s]
+    values = filter ? filter.values : []
+
+    render :json => values
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
   private
 
   def find_query