X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fwriting_formats_controller.rb;h=4f9e0ecaefcaa419e831ab44926a80a361455720;hp=520cf61bfcc42110a5899ccafd956c709e7e4b91;hb=d7c8065be895b67dc453b0e11ad0f259f1ca6706;hpb=c5c2d866ddd974f3e8f36c2879a54bf39de028c3

diff --git a/app/controllers/writing_formats_controller.rb b/app/controllers/writing_formats_controller.rb
index 520cf61b..4f9e0eca 100644
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -1,23 +1,24 @@
 class WritingFormatsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => []
+    before_action :authenticate_user, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :count]
-    before_filter :authenticate_user, :only => []
-  end
-  before_filter :authenticate_admin!, :only => [:destroy]
-
-  def self.model
-    WritingFormat
+    before_action :authenticate_reader, :only => [
+      :index, :by_system_picture, :show
+    ]
+    before_action :authenticate_user, :only => []
   end
+  before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   
   def index
     filer_list
   end
-
+  
+  def by_system_picture
+    filer_list param: params[:id]
+  end
+  
   def show_html_format format
     format.html {
-      @writing_format = @item
     }
   end
   
@@ -29,9 +30,37 @@ class WritingFormatsController < ApplicationController
       show_json_format format
     end
   end
-
-  def count
-    list_count
+  
+  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 = @item.permit_params params
+    @item.overwrite 
+    render_create
+  end
+  
+  def update
+    set_edit
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = @item.permit_params params
+    @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