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#32402:add file prof
[pettanr/pettanr.git]
/
app
/
controllers
/
speeches_controller.rb
diff --git
a/app/controllers/speeches_controller.rb
b/app/controllers/speeches_controller.rb
index
24ca971
..
8aa7789
100644
(file)
--- a/
app/controllers/speeches_controller.rb
+++ b/
app/controllers/speeches_controller.rb
@@
-16,7
+16,13
@@
class SpeechesController < ApplicationController
@speeches = Speech.list(@page, @page_size)
respond_to do |format|
@speeches = Speech.list(@page, @page_size)
respond_to do |format|
- format.html # index.html.erb
+ format.html {
+ @paginate = Speech.list_paginate(@page, @page_size)
+ render :template => 'system/filer', :locals => {
+ :items => @speeches, :model => Speech,
+ :roles => [@user, @admin], :pager => @paginate
+ }
+ }
format.json { render json: @speeches.to_json(Speech.list_json_opt) }
end
end
format.json { render json: @speeches.to_json(Speech.list_json_opt) }
end
end