Add changeset comment query limit settings; use common query limit in changeset comme...

[rails.git] / app / controllers / concerns / query_methods.rb

diff --git a/app/controllers/concerns/query_methods.rb b/app/controllers/concerns/query_methods.rb
index 2d0bfee53a307c95f7a27b944815c2e3e0f982f5..2656eb4af4c22ffc96451fc484c427c898a99584 100644 (file)
--- a/app/controllers/concerns/query_methods.rb
+++ b/app/controllers/concerns/query_methods.rb
@@ -12,8 +12,9 @@ module QueryMethods
   ##
   # Get query limit value from request parameters and settings
   def query_limit_value
   ##
   # Get query limit value from request parameters and settings
   def query_limit_value

-    max_limit = Settings["max_#{controller_name.singularize}_query_limit"]
-    default_limit = Settings["default_#{controller_name.singularize}_query_limit"]
+    name = controller_path.sub(%r{^api/}, "").tr("/", "_").singularize
+    max_limit = Settings["max_#{name}_query_limit"]
+    default_limit = Settings["default_#{name}_query_limit"]

     if params[:limit]
       if params[:limit].to_i.positive? && params[:limit].to_i <= max_limit
         params[:limit].to_i
     if params[:limit]
       if params[:limit].to_i.positive? && params[:limit].to_i <= max_limit
         params[:limit].to_i