X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fwriting_formats_controller.rb;h=0e4c6631cef3951a654d5759428fdf13f2e9cc01;hb=674d4fb2e72c2e1653b13d026af884559fd9eb4e;hp=a6bed1aff1d5e8adfb32cc444c005fa37ce1eb7e;hpb=ffcde0e88b1283f7cd05cfc2ed939de88cc8e7be;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/writing_formats_controller.rb b/app/controllers/writing_formats_controller.rb
index a6bed1af..0e4c6631 100644
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -1,33 +1,66 @@
 class WritingFormatsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :show]
+    before_filter :authenticate_reader, :only => [
+      :index, :by_system_picture, :show
+    ]
     before_filter :authenticate_user, :only => []
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
-
-  @@model = WritingFormat
+  before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+  
   def index
-    set_filer
-
-    respond_to do |format|
-      format_filer format
-      format.json { render json: @items.to_json(@@model.list_json_opt) }
-    end
+    filer_list
+  end
+  
+  def by_system_picture
+    filer_list
   end
-
+  
+  def show_html_format format
+    format.html {
+    }
+  end
+  
   def show
-    @item = WritingFormat.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format.html {
-        @writing_format = @item
-      }
-      format_prof format
-      format.json { render :json => @item.to_json(WritingFormat.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
+  def create
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite 
+    render_create
+  end
+  
+  def update
+    set_edit
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite 
+    render_update
+  end
+  
+  def destroy
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/' + @my_model_class.path_name
+  end
+  
 end