X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fartists_controller.rb;h=f840f78baee94ed762742429c4ada1e7473177f1;hb=30e0eb45652d2f78a327be7e49534de11ecea74a;hp=dbcfab521d6581f34bac9244997e113a57e9fe35;hpb=4ba1fbdb35a728d31d9588cdd7a23fb642b7459c;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index dbcfab52..f840f78b 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -1,6 +1,5 @@
 class ArtistsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  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]
   else
@@ -8,135 +7,81 @@ class ArtistsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  def self.model
+    Artist
+  end
+  
   def index
-    @page = Artist.page params[:page]
-    @page_size = Artist.page_size params[:page_size]
-    @artists = Artist.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html {
-        @paginate = Artist.list_paginate(@page, @page_size)
-      }
-      format.json { render :json => @artists.to_json(Artist.list_json_opt) }
-    end
+    filer_list
   end
-
-  def show
-    @ar = Artist.show(params[:id], [@user, @admin, @demand_user])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @ar.to_json(Artist.show_json_opt) }
-    end
+  
+  def show_html_format format
+    format.html {
+      @artist = @item
+    }
   end
-
-  def resource_pictures
-    @ar = Artist.show(params[:id], [@user, @admin, @demand_user])
-    @page = Author.page params[:page]
-    @page_size = Author.resource_picture_page_size params[:page_size]
-    @resource_pictures = ResourcePicture.himlist(@ar, @page, @page_size)
+  
+  def show
+    set_show
     respond_to do |format|
-      format.html {
-        @paginate = ResourcePicture.himlist_paginate(@ar, @page, @page_size)
-      }
-      format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
   
   def count
-    @ar = {:count => Artist.visible_count}
-    respond_to do |format|
-      format.json { render json: @ar.to_json }
-    end
+    list_count
   end
   
-  def list
-    @artists = Artist.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @artists }
-    end
-  end
-
-  def browse
-    @ar = Artist.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @ar }
-    end
-  end
-
-  # GET /artists/new
-  # GET /artists/new.json
   def new
-    @ar = Artist.new
-    @ar.supply_default 
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.js
-      format.json { render json: @ar.to_json(Artist.show_json_opt) }
-    end
+    form_new
   end
-
-  # GET /artists/1/edit
+  
   def edit
-    @ar = Artist.edit(params[:id], @author)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
-  # POST /artists
-  # POST /artists.json
+  
   def create
-    @ar = Artist.new()
-    @ar.supply_default 
-    @ar.attributes = params[:artist]
-    @ar.overwrite @author
+    @artist = Artist.new()
+    @artist.supply_default 
+    @artist.attributes = params[:artist]
+    @artist.overwrite @operators
     respond_to do |format|
-      if @ar.save
+      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: @ar.to_json(Artist.show_json_opt), status: :created, location: @artist }
+        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: @ar.errors, status: :unprocessable_entity }
+        format.json { render json: @artist.errors, status: :unprocessable_entity }
       end
     end
   end
 
-  # PUT /artists/1
-  # PUT /artists/1.json
   def update
-    @ar = Artist.edit(params[:id], @author)
-    @ar.attributes = params[:artist]
-    @ar.overwrite @author
+    @artist = Artist.edit(params[:id], @operators)
+    @artist.attributes = params[:artist]
+    @artist.overwrite @operators
 
     respond_to do |format|
-      if @ar.save
+      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: @ar.errors, status: :unprocessable_entity }
+        format.json { render json: @artist.errors, status: :unprocessable_entity }
       end
     end
   end
 
-  # DELETE /artists/1
-  # DELETE /artists/1.json
   def destroy
-    @ar = Artist.edit(params[:id], @author)
-    @ar.destroy
+    @artist = Artist.edit(params[:id], @operators)
+    @artist.destroy
 
     respond_to do |format|
       format.html { redirect_to artists_url }