fix: fetch fail

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

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index dc31794..b0f3007 100644 (file)
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -1,23 +1,19 @@
 class LicensesController < ApplicationController
-  before_filter :authenticate_resource_reader, :only => [
-    :by_license_group, :by_system_picture, :count_by_license_group, :count_by_system_picture
+  before_action :authenticate_resource_reader, :only => [
+    :by_license_group, :by_system_picture
   ]
-  before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
-
-  def self.model
-    License
-  end
+  before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   
   def index
     filer_list
   end
   
   def by_license_group
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_system_picture
-    filer_list
+    filer_list param: params[:id]
   end
   
   def show_html_format format
@@ -34,7 +30,7 @@ class LicensesController < ApplicationController
       show_json_format format
     end
   end
-
+  
   def search
     @licenses = License.list_by_name(params[:name])
     
@@ -44,18 +40,6 @@ class LicensesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_license_group
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end
@@ -69,7 +53,7 @@ class LicensesController < 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
@@ -77,17 +61,15 @@ class LicensesController < 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