temp

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 732dae7..0985278 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -10,30 +10,25 @@ class ArtistsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  @@model = Artist
   def index
-    @page = Artist.page_number params[:page]
-    @page_size = Artist.page_size params[:page_size]
-    @artists = Artist.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = Artist.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @artists, :model => Artist, 
-          :perator => @operators, :pager => @paginate
-        }
-      }
-      format.json { render :json => @artists.to_json(Artist.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @artist = Artist.show(params[:id], @operators)
+    @item = Artist.show(params[:id], @operators)
 
     respond_to do |format|
-      format.html # show.html.erb
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render :json => @artist.to_json(Artist.show_json_opt) }
+      format.html {
+        @artist = @item
+      }
+      format_prof format
+      format.json { render :json => @item.to_json(Artist.show_json_opt) }
     end
   end