Added is_primary to locations serializer, reset kaminari page to 1 if…

… < max count per page
IOfoundation · May 3, 2019 · 8709a0b · 8709a0b
1 parent 03183e1
commit 8709a0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/admin/blog_posts_controller.rb b/app/controllers/admin/blog_posts_controller.rb
@@ -5,6 +5,7 @@ class BlogPostsController < ApplicationController
 
     def index
       @blog_posts = Kaminari.paginate_array(policy_scope(filter_blog_posts))
+      params[:page] = 1 if @blog_posts.count < Kaminari.config.default_per_page
       @blog_posts = @blog_posts.page(params[:page])
                                .per(params[:per_page])
     end
@@ -43,7 +44,6 @@ def filter_blog_posts
       if params[:filter] == 'front page' || params[:filter] == 'featured'
         blog_posts = blog_posts.tagged_with(params[:filter])
       end
-
       blog_posts
     end
   end

diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
@@ -15,6 +15,7 @@ def index
                 else
                   Kaminari.paginate_array(policy_scope(Event))
                 end
+      params[:page] = 1 if @events.count < Kaminari.config.default_per_page
       @events = @events.page(params[:page])
                        .per(params[:per_page])
     end

diff --git a/app/serializers/locations_serializer.rb b/app/serializers/locations_serializer.rb
@@ -1,7 +1,7 @@
 class LocationsSerializer < ActiveModel::Serializer
   attributes :id, :active, :admin_emails, :alternate_name, :coordinates,
              :description, :latitude, :longitude, :name, :short_desc, :slug,
-             :website, :updated_at, :url
+             :website, :updated_at, :url, :is_primary
 
   has_one :address
   has_one :organization, serializer: LocationsOrganizationSerializer