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 a2fa524..492e4ce 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -1,101 +1,61 @@
 class ArtistsController < ApplicationController
-  before_filter :authenticate_author!, :only => [:index, :show, :create, :update, :destroy]
-  before_filter :authenticate_admin!, :only => [:list, :browse]
-
-  # GET /artists
-  # GET /artists.json
-  def index
-    @artists = Artist.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @artists }
-    end
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
+    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
+  else
+    before_filter :authenticate_resource_reader, :only => [
+      :index, :show
+    ]
+    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   end
-
-  # GET /artists/1
-  # GET /artists/1.json
-  def show
-    @artist = Artist.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @artist }
-    end
+  
+  def index
+    filer_list
   end
-
-  def list
-    @artists = Artist.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @artists }
-    end
+  
+  def show_html_format format
+    format.html {
+    }
   end
-
-  def browse
-    @artist = Artist.find(params[:id])
-
+  
+  def show
+    set_show
     respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @artist }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
-  # GET /artists/new
-  # GET /artists/new.json
+  
   def new
-    @artist = Artist.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @artist }
-    end
+    form_new
   end
-
-  # GET /artists/1/edit
+  
   def edit
-    @artist = Artist.find(params[:id])
+    form_edit
   end
-
-  # POST /artists
-  # POST /artists.json
+  
   def create
-    @artist = Artist.new(params[:artist])
-
-    respond_to do |format|
-      if @artist.save
-        format.html { redirect_to @artist, notice: 'Artist was successfully created.' }
-        format.json { render json: @artist, status: :created, location: @artist }
-      else
-        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
-
-  # PUT /artists/1
-  # PUT /artists/1.json
+  
   def update
-    @artist = Artist.find(params[:id])
-
-    respond_to do |format|
-      if @artist.update_attributes(params[:artist])
-        format.html { redirect_to @artist, notice: 'Artist was successfully updated.' }
-        format.json { head :ok }
-      else
-        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
-
-  # DELETE /artists/1
-  # DELETE /artists/1.json
+  
   def destroy
-    @artist = Artist.find(params[:id])
+    @artist = Artist.edit(params[:id], @operators)
     @artist.destroy
-
+    
     respond_to do |format|
       format.html { redirect_to artists_url }
       format.json { head :ok }