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
/
home_controller.rb
diff --git
a/app/controllers/home_controller.rb
b/app/controllers/home_controller.rb
index
f91a23e
..
1458a2c
100644
(file)
--- a/
app/controllers/home_controller.rb
+++ b/
app/controllers/home_controller.rb
@@
-46,7
+46,9
@@
class HomeController < ApplicationController
@comics = Comic.mylist(@author, @page, @page_size)
respond_to do |format|
@comics = Comic.mylist(@author, @page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = Comic.mylist_paginate(@author, @page, @page_size)
+ }
format.json { render json: @comics.to_json(Comic.list_json_opt) }
end
end
format.json { render json: @comics.to_json(Comic.list_json_opt) }
end
end
@@
-57,7
+59,9
@@
class HomeController < ApplicationController
@stories = Story.mylist(@author, @page, @page_size)
respond_to do |format|
@stories = Story.mylist(@author, @page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = Story.mylist_paginate(@author, @page, @page_size)
+ }
format.json { render text: Story.list_as_json_text(@stories) }
end
end
format.json { render text: Story.list_as_json_text(@stories) }
end
end
@@
-68,7
+72,9
@@
class HomeController < ApplicationController
@panels = Panel.mylist(@author, @page, @page_size)
respond_to do |format|
@panels = Panel.mylist(@author, @page, @page_size)
respond_to do |format|
- format.html
+ format.html {
+ @paginate = Panel.mylist_paginate(@author, @page, @page_size)
+ }
format.json { render text: Panel.list_as_json_text(@panels) }
end
end
format.json { render text: Panel.list_as_json_text(@panels) }
end
end
@@
-79,7
+85,9
@@
class HomeController < ApplicationController
@panel_pictures = PanelPicture.mylist(@author, @page, @page_size)
respond_to do |format|
@panel_pictures = PanelPicture.mylist(@author, @page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = PanelPicture.mylist_paginate(@author, @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
@@
-90,7
+98,9
@@
class HomeController < ApplicationController
@ground_pictures = GroundPicture.mylist(@author, @page, @page_size)
respond_to do |format|
@ground_pictures = GroundPicture.mylist(@author, @page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = GroundPicture.mylist_paginate(@author, @page, @page_size)
+ }
format.json { render json: @ground_pictures.to_json(GroundPicture.list_json_opt) }
end
end
format.json { render json: @ground_pictures.to_json(GroundPicture.list_json_opt) }
end
end
@@
-101,7
+111,9
@@
class HomeController < ApplicationController
@ground_colors = GroundColor.mylist(@author, @page, @page_size)
respond_to do |format|
@ground_colors = GroundColor.mylist(@author, @page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = GroundColor.mylist_paginate(@author, @page, @page_size)
+ }
format.json { render json: @ground_colors.to_json(GroundColor.list_json_opt) }
end
end
format.json { render json: @ground_colors.to_json(GroundColor.list_json_opt) }
end
end
@@
-112,7
+124,9
@@
class HomeController < ApplicationController
@resource_pictures = ResourcePicture.mylist(@artist, @page, @page_size)
respond_to do |format|
@resource_pictures = ResourcePicture.mylist(@artist, @page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = ResourcePicture.mylist_paginate(@author, @page, @page_size)
+ }
format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
end
end
format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
end
end