Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 3f980c1..492e4ce 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -1,103 +1,61 @@
 class ArtistsController < 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_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   else
-    before_filter :authenticate_resource_reader, :only => [:index, :show, :resource_pictures]
+    before_filter :authenticate_resource_reader, :only => [
+      :index, :show
+    ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
-  end
-
-  def self.model
-    Artist
+    before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   end
   
   def index
-    public_list
+    filer_list
   end
-
-  def resource_pictures
-    has_many_list
+  
+  def show_html_format format
+    format.html {
+    }
   end
   
   def show
-    @item = Artist.show(params[:id], @operators)
-
-    respond_to do |format|
-      format.html {
-        @artist = @item
-      }
-      format_prof format
-      format.json { render :json => @item.to_json(Artist.show_json_opt) }
-    end
-  end
-
-  def count
-    @artist = {:count => Artist.visible_count}
+    set_show
     respond_to do |format|
-      format.json { render json: @artist.to_json }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
   
   def new
-    @artist = Artist.new
-    @artist.supply_default 
-
-    respond_to do |format|
-      format.html
-      format.js
-      format.json { render json: @artist.to_json(Artist.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @artist = Artist.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
-    @artist = Artist.new()
-    @artist.supply_default 
-    @artist.attributes = params[:artist]
-    @artist.overwrite @operators
-    respond_to do |format|
-      if @artist.save
-        flash[:notice] = I18n.t('flash.notice.created', :model => Artist.model_name.human)
-        format.html { redirect_to root_path }
-        format.json { render json: @artist.to_json(Artist.show_json_opt), status: :created, location: @artist }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => Artist.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @artist.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite @operators
+    render_create root_path
   end
-
+  
   def update
-    @artist = Artist.edit(params[:id], @operators)
-    @artist.attributes = params[:artist]
-    @artist.overwrite @operators
-
-    respond_to do |format|
-      if @artist.save
-        flash[:notice] = I18n.t('flash.notice.updated', :model => Artist.model_name.human)
-        format.html { redirect_to '/home/configure' }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Artist.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @artist.errors, status: :unprocessable_entity }
-      end
-    end
+    set_edit
+    @item.attributes = params[@my_model_class.item_name]
+    @item.overwrite @operators
+    render_update '/home/configure'
   end
-
+  
   def destroy
     @artist = Artist.edit(params[:id], @operators)
     @artist.destroy
-
+    
     respond_to do |format|
       format.html { redirect_to artists_url }
       format.json { head :ok }