fix: fetch fail

[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 078566b..4f9e0ec 100644 (file)
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -1,22 +1,20 @@
 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, :by_system_picture, :show, :count, :count_by_system_picture]
-    before_filter :authenticate_user, :only => []
-  end
-  before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :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
+    filer_list param: params[:id]
   end
   
   def show_html_format format
@@ -33,14 +31,6 @@ class WritingFormatsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end
@@ -54,7 +44,7 @@ class WritingFormatsController < ApplicationController
     @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.attributes = @item.permit_params params
     @item.overwrite 
     render_create
   end
@@ -62,18 +52,15 @@ class WritingFormatsController < ApplicationController
   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.attributes = @item.permit_params params
     @item.overwrite 
     render_update
   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