add: license publisher

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

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index fe93071..cd697dd 100644 (file)
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -1,12 +1,8 @@
 class LicensesController < ApplicationController
   before_filter :authenticate_resource_reader, :only => [
-    :by_license_group, :by_system_picture, :count_by_license_group, :count_by_system_picture
+    :by_license_group, :by_system_picture
   ]
   before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
-
-  def self.model
-    License
-  end
   
   def index
     filer_list
@@ -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
@@ -65,49 +49,27 @@ class LicensesController < ApplicationController
   end
   
   def create
-    @item = self.class.model.new
+    set_model
+    @item = @my_model_class.new
     @item.supply_default 
-    @item.attributes = params[:license]
-    @item.overwrite @operators
-
-    if @item.save
-      respond_to do |format|
-        flash[:notice] = I18n.t('flash.notice.created', :model => self.class.model.model_name.human)
-        format.html { redirect_to @item }
-        format.json { render json: @item.to_json(self.class.model.show_json_opt), status: :created, location: @item }
-      end
-    else
-      flash[:notice] = I18n.t('flash.notice.not_created', :model => self.class.model.model_name.human)
-      render_new
-        format.html { render action: "new" }
-        format.json { render json: @item.errors, status: :unprocessable_entity }
-    end
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite 
+    render_create
   end
-
+  
   def update
-    @item = self.class.model.edit(params[:id], @operators)
-    self.class.model.fold_extend_settings params
-    @item.attributes = params[:license]
+    set_edit
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = params[@my_model_class.item_name]
     @item.overwrite 
-    respond_to do |format|
-      if @item.save
-        flash[:notice] = I18n.t('flash.notice.updated', :model => self.class.model.model_name.human)
-        format.html { redirect_to @item }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => self.class.model.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @item.errors, status: :unprocessable_entity }
-      end
-    end
+    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