Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[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 cdb27e5..0e4c663 100644 (file)
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -58,12 +58,9 @@ class WritingFormatsController < ApplicationController
   end
   
   def destroy
-    @item = self.class.model.edit(params[:id], @operators)
-    respond_to do |format|
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => self.class.model.model_name.human)
-        format.html { redirect_to @item }
-        format.json { render json: @item.errors, status: :unprocessable_entity }
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/' + @my_model_class.path_name
   end
   
 end