X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Flicenses_controller.rb;h=b0f30074440621cfe7f56db369456fd320e77de1;hb=9edc3731389bcae0de05ef6045cceb6b7581cc8f;hp=6e7ead52a4ef5c78ce546e7bd1844598ec6c1111;hpb=6fb8bc9e0e2b4ee9840f42e2915598db46b9a4b8;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index 6e7ead52..b0f30074 100644
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -1,25 +1,36 @@
 class LicensesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-
-  def self.model
-    License
-  end
+  before_action :authenticate_resource_reader, :only => [
+    :by_license_group, :by_system_picture
+  ]
+  before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   
   def index
-    public_list
+    filer_list
+  end
+  
+  def by_license_group
+    filer_list param: params[:id]
+  end
+  
+  def by_system_picture
+    filer_list param: params[:id]
   end
-
+  
+  def show_html_format format
+    format.html {
+      @license = @item
+    }
+  end
+  
   def show
-    @item = License.show(params[:id], @operators)
+    set_show
     respond_to do |format|
-      format.html {
-        @license = @item
-      }
-      format_prof format
-      format.json { render json: @item.to_json(License.show_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
+  
   def search
     @licenses = License.list_by_name(params[:name])
     
@@ -29,4 +40,36 @@ class LicensesController < ApplicationController
     end
   end
   
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
+  def create
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @my_model_class.fold_extend_settings params[@my_model_class.item_name]
+    @item.attributes = @item.permit_params params
+    @item.overwrite 
+    render_create
+  end
+  
+  def update
+    set_edit
+    @my_model_class.fold_extend_settings 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