t#31470:create pager

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 9db1452..28bd0c1 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -10,21 +10,19 @@ class ArtistsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
-  # GET /artists
-  # GET /artists.json
   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 # index.html.erb
+      format.html {
+        @paginate = Artist.list_paginate(@page, @page_size)
+      }
       format.json { render :json => @artists.to_json(Artist.list_json_opt) }
     end
   end
 
-  # GET /artists/1
-  # GET /artists/1.json
   def show
     @ar = Artist.show(params[:id], [@user, @admin, @demand_user])