fix form

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 173ec17..c46f864 100644 (file)
--- 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,27 +7,18 @@ 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]
 
-  @@model = Artist
+  def self.model
+    Artist
+  end
+  
   def index
-    set_page params @@model, params
-    @items = @@model.list(@page, @page_size)
-    
-    respond_to do |format|
-      format.html {
-        @paginate = @@model.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :filer => @filer.window(@items, @operators, @paginate)
-        }
-      }
-      format.json { render json: @items.to_json(@@model.list_json_opt) }
-    end
+    filer_list
   end
-
+  
   def show
     @item = Artist.show(params[:id], @operators)
-
+  
     respond_to do |format|
       format.html {
         @artist = @item
@@ -37,64 +27,19 @@ class ArtistsController < ApplicationController
       format.json { render :json => @item.to_json(Artist.show_json_opt) }
     end
   end
-
-  def resource_pictures
-    @artist = Artist.show(params[:id], @operators)
-    @page = Author.page params[:page]
-    @page_size = Author.resource_picture_page_size params[:page_size]
-    @resource_pictures = ResourcePicture.himlist(@artist, @page, @page_size)
-    respond_to do |format|
-      format.html {
-        @paginate = ResourcePicture.himlist_paginate(@artist, @page, @page_size)
-      }
-      format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
-    end
-  end
   
   def count
-    @artist = {:count => Artist.visible_count}
-    respond_to do |format|
-      format.json { render json: @artist.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
-    @artist = Artist.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @artist }
-    end
-  end
-
   def new
-    @artist = Artist.new
-    @artist.supply_default 
-
-    respond_to do |format|
-      format.html # new.html.erb
-      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