rails upgrade to 4 for js

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

diff --git a/app/controllers/license_groups_controller.rb b/app/controllers/license_groups_controller.rb
index 2b12b4a..b7ea646 100644 (file)
--- a/app/controllers/license_groups_controller.rb
+++ b/app/controllers/license_groups_controller.rb
@@ -1,11 +1,11 @@
 class LicenseGroupsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
   else
-    before_filter :authenticate_reader, :only => [
+    before_action :authenticate_reader, :only => [
       :by_resource_picture
     ]
   end
-  before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+  before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   
   def index
     filer_list
@@ -43,7 +43,7 @@ class LicenseGroupsController < 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
@@ -51,9 +51,15 @@ class LicenseGroupsController < 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
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/' + @my_model_class.path_name
+  end
+  
 end