From 7e6918df080c8d2d6722e742b809b4b95a5576b4 Mon Sep 17 00:00:00 2001 From: Tommaso Valentini Date: Fri, 12 Feb 2016 17:01:00 +0100 Subject: [PATCH] Pass existing locals to subsequent index pages --- lib/middleman/pagination/index_page.rb | 7 ++++--- lib/middleman/pagination/pageable.rb | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/middleman/pagination/index_page.rb b/lib/middleman/pagination/index_page.rb index f59b4e2..f5b36b0 100644 --- a/lib/middleman/pagination/index_page.rb +++ b/lib/middleman/pagination/index_page.rb @@ -2,14 +2,15 @@ module Middleman module Pagination class IndexPage - attr_reader :extension_context, :first_index, :pageable_context, :page_num, :symbolic_replacement_path + attr_reader :extension_context, :first_index, :pageable_context, :page_num, :symbolic_replacement_path, :index_locals - def initialize(extension_context, first_index, pageable_context, page_num, symbolic_replacement_path) + def initialize(extension_context, first_index, pageable_context, page_num, symbolic_replacement_path, index_locals) @extension_context = extension_context @first_index = first_index @pageable_context = pageable_context @page_num = page_num @symbolic_replacement_path = symbolic_replacement_path + @index_locals = index_locals end def resource @@ -37,7 +38,7 @@ def metadata end def locals - { pagination: in_page_context } + index_locals.merge({ pagination: in_page_context }) end def in_page_context diff --git a/lib/middleman/pagination/pageable.rb b/lib/middleman/pagination/pageable.rb index 784f3d5..b8ff771 100644 --- a/lib/middleman/pagination/pageable.rb +++ b/lib/middleman/pagination/pageable.rb @@ -47,7 +47,8 @@ def new_pages_for_index(extension_context, index, resources) index, pageable_context, page_num, - symbolic_replacement_path).resource + symbolic_replacement_path, + index.metadata[:locals]).resource pageable_context.index_resources << new_index