diff --git a/app/controllers/mobile_controller.rb b/app/controllers/mobile_controller.rb index 369bfa220..3879c393c 100644 --- a/app/controllers/mobile_controller.rb +++ b/app/controllers/mobile_controller.rb @@ -43,7 +43,7 @@ class MobileController < ApplicationController def page @page_title = t('mobile.page') - @page_contexts = PageContext.where(:archived => false).page(params[:page_main]).per(15) + @page_contexts = get_sorted_page_from_structure end def page_content @@ -57,4 +57,12 @@ class MobileController < ApplicationController @no_footer = true if request.path =~ /app/ end + def get_sorted_page_from_structure + page_contexts = Item.structure_ordered_items.inject([]){ |pages, page| + pages << page.page_contexts.where(archived: false).limit(1)[0] if page.is_a?(Page) && !page.page_contexts.blank? + pages + } + Kaminari.paginate_array(page_contexts).page(params[:page]).per(15) + end + end