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
temp
[pettanr/pettanr.git]
/
app
/
controllers
/
speech_balloon_templates_controller.rb
diff --git
a/app/controllers/speech_balloon_templates_controller.rb
b/app/controllers/speech_balloon_templates_controller.rb
index
c89db4b
..
01f4f24
100644
(file)
--- a/
app/controllers/speech_balloon_templates_controller.rb
+++ b/
app/controllers/speech_balloon_templates_controller.rb
@@
-8,14
+8,12
@@
class SpeechBalloonTemplatesController < ApplicationController
end
before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
end
before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
- @@model = SpeechBalloonTemplate
+ def self.model
+ SpeechBalloonTemplate
+ end
+
def index
def index
- set_filer
-
- respond_to do |format|
- format_filer format
- format.json { render json: @items.to_json(@@model.list_json_opt) }
- end
+ public_list
end
def show
end
def show