fixes #97 _paginate.html.erb isn't rendered with custom theme
This commit is contained in:
parent
36d07200c9
commit
2dd06266db
11
CHANGELOG
11
CHANGELOG
|
@ -1,3 +1,12 @@
|
||||||
|
== 0.12.1
|
||||||
|
|
||||||
|
* Slim template support #93 [detrain]
|
||||||
|
|
||||||
|
* Use Kaminari.config to specify default value for param_name #94 [avsej]
|
||||||
|
|
||||||
|
* Fixed "super called outside of method" error happened in particular versions
|
||||||
|
of Ruby 1.8.7 #91 [Skulli]
|
||||||
|
|
||||||
== 0.12.0
|
== 0.12.0
|
||||||
|
|
||||||
* General configuration options #41 #62 [javierv, iain]
|
* General configuration options #41 #62 [javierv, iain]
|
||||||
|
@ -6,7 +15,7 @@
|
||||||
Also, here comes a generator command that generates the default
|
Also, here comes a generator command that generates the default
|
||||||
configuration file into your app's config/initilizers directory.
|
configuration file into your app's config/initilizers directory.
|
||||||
|
|
||||||
* Generic pagination support for Array object #47 #68 #74 [lda ened jianlin]
|
* Generic pagination support for Array object #47 #68 #74 [lda, ened, jianlin]
|
||||||
You can now paginate through any kind of Arrayish object in this way:
|
You can now paginate through any kind of Arrayish object in this way:
|
||||||
Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
|
Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ module Kaminari
|
||||||
h[:right] = outer_window if h[:right] == 0
|
h[:right] = outer_window if h[:right] == 0
|
||||||
end
|
end
|
||||||
@template, @options = template, options
|
@template, @options = template, options
|
||||||
|
@theme = @options[:theme] ? "#{@options[:theme]}/" : ''
|
||||||
@options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
|
@options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
|
||||||
# so that this instance can actually "render". Black magic?
|
# so that this instance can actually "render". Black magic?
|
||||||
@output_buffer = ActionView::OutputBuffer.new
|
@output_buffer = ActionView::OutputBuffer.new
|
||||||
|
|
Loading…
Reference in New Issue