rails upgrade to 4

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

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index 838d7d8..6acc8c9 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,13 +1,13 @@
 class ComicsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [
+    before_action :authenticate_reader, :only => [
       :index, :show, :play, :by_story, :by_author
     ]
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index
@@ -70,7 +70,7 @@ class ComicsController < 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 @operators
     render_create
   end
@@ -78,7 +78,7 @@ class ComicsController < 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 @operators
     render_update
   end