OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t#31470:create pager
[pettanr/pettanr.git]
/
app
/
controllers
/
panel_pictures_controller.rb
diff --git
a/app/controllers/panel_pictures_controller.rb
b/app/controllers/panel_pictures_controller.rb
index
7c91306
..
91444ce
100644
(file)
--- a/
app/controllers/panel_pictures_controller.rb
+++ b/
app/controllers/panel_pictures_controller.rb
@@
-16,7
+16,9
@@
class PanelPicturesController < ApplicationController
@panel_pictures = PanelPicture.list(@page, @page_size)
respond_to do |format|
@panel_pictures = PanelPicture.list(@page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = PanelPicture.list_paginate(@page, @page_size)
+ }
format.json { render :json => @panel_pictures.to_json(PanelPicture.list_json_opt) }
end
end
format.json { render :json => @panel_pictures.to_json(PanelPicture.list_json_opt) }
end
end