Merge pull request #138 from ChicagoWorldcon/room-fix

rooms and room sets not paginated
PlanoramaEvents · May 26, 2022 · 62f5939 · 62f5939
2 parents 74f52e2 + 9574187
commit 62f5939
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/app/controllers/concerns/resource_methods.rb b/app/controllers/concerns/resource_methods.rb
@@ -692,7 +692,7 @@ def paginated
     format = params[:format]
     return false if format == 'xls' || format == 'xlsx'
 
-    paginate
+    params[:perPage]&.to_i || paginate
   end
 
   def derived_col?(col_name:)

diff --git a/app/controllers/room_sets_controller.rb b/app/controllers/room_sets_controller.rb
@@ -2,4 +2,8 @@ class RoomSetsController < ResourceController
   SERIALIZER_CLASS = 'RoomSetSerializer'.freeze
   POLICY_CLASS = 'RoomSetsPolicy'.freeze
   POLICY_SCOPE_CLASS = 'RoomSetsPolicy::Scope'.freeze
+
+  def paginate
+    false
+  end
 end
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
@@ -3,4 +3,8 @@ class RoomsController < ResourceController
   POLICY_CLASS = 'RoomPolicy'.freeze
   POLICY_SCOPE_CLASS = 'RoomPolicy::Scope'.freeze
   DEFAULT_SORTBY = 'rooms.sort_order'
+
+  def paginate
+    false
+  end
 end