temp

[pettanr/pettanr.git] / app / controllers / writing_formats_controller.rb

diff --git a/app/controllers/writing_formats_controller.rb b/app/controllers/writing_formats_controller.rb
index d4d38ce..a6bed1a 100644 (file)
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -8,34 +8,25 @@ class WritingFormatsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
 
+  @@model = WritingFormat
   def index
-    @writing_formats = WritingFormat.enable_list
+    set_filer
 
     respond_to do |format|
-      format.html {
-        render :template => 'system/filer', :locals => {
-          :items => @writing_formats, :model => WritingFormat, 
-          :roles => [@user, @admin], :pager => nil
-        }
-      }
-      format.json { render json: @writing_formats.to_json(WritingFormat.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @item = WritingFormat.show(params[:id], [@user, @admin])
+    @item = WritingFormat.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
         @writing_format = @item
       }
       format_prof format
-      format.json {
-        render :json => @item.to_json(WritingFormat.show_json_opt)
-      }
-      format.jsonp {
-        render :json => "callback(" + @item.to_json() + ")"
-      }
+      format.json { render :json => @item.to_json(WritingFormat.show_json_opt) }
     end
   end