Fixes picture per page in overlay

AlchemyCMS · Sep 20, 2018 · db2af65 · db2af65
1 parent 0dbd7f2
commit db2af65
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/app/controllers/alchemy/admin/pictures_controller.rb b/app/controllers/alchemy/admin/pictures_controller.rb
@@ -113,7 +113,16 @@ def destroy
       end
 
       def items_per_page
-        cookies[:alchemy_pictures_per_page] = params[:per_page] || cookies[:alchemy_pictures_per_page] || pictures_per_page_for_size(@size)
+        if in_overlay?
+          case @size
+          when 'small' then 25
+          when 'large' then 4
+          else
+            9
+          end
+        else
+          cookies[:alchemy_pictures_per_page] = params[:per_page] || cookies[:alchemy_pictures_per_page] || pictures_per_page_for_size(@size)
+        end
       end
 
       def items_per_page_options
@@ -125,12 +134,10 @@ def items_per_page_options
 
       def pictures_per_page_for_size(size)
         case size
-        when 'small'
-          in_overlay? ? 25 : 60
-        when 'large'
-          in_overlay? ? 4 : 12
+        when 'small' then 60
+        when 'large' then 12
         else
-          in_overlay? ? 9 : 20
+          20
         end
       end