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 a89f957..c89db4b 100644 (file)
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -8,22 +8,18 @@ class SpeechBalloonTemplatesController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
 
+  @@model = SpeechBalloonTemplate
   def index
-    @speech_balloon_templates = SpeechBalloonTemplate.enable_list
+    set_filer
 
     respond_to do |format|
-      format.html {
-        render :template => 'system/filer', :locals => {
-          :items => @speech_balloon_templates, :model => SpeechBalloonTemplate, 
-          :roles => [@user, @admin], :pager => nil
-        }
-      }
-      format.json { render json: @speech_balloon_templates.to_json(SpeechBalloonTemplate.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @item = SpeechBalloonTemplate.show(params[:id], [@user, @admin])
+    @item = SpeechBalloonTemplate.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
@@ -33,9 +29,6 @@ class SpeechBalloonTemplatesController < ApplicationController
       format.json {
         render :json => @item.to_json(SpeechBalloonTemplate.show_json_opt)
       }
-      format.jsonp {
-        render :json => "callback(" + @item.to_json() + ")"
-      }
     end
   end