diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/assets_controller.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index 4734a54..b1abb0f 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb | |||
| @@ -2,15 +2,12 @@ class AssetsController < ApplicationController | |||
| 2 | 2 | ||
| 3 | layout 'admin' | 3 | layout 'admin' |
| 4 | 4 | ||
| 5 | # GET /assets | ||
| 6 | # GET /assets.xml | ||
| 7 | def index | 5 | def index |
| 8 | @assets = Asset.all | 6 | @assets = Asset.all.paginate( |
| 9 | 7 | :page => params[:page], | |
| 10 | respond_to do |format| | 8 | :per_page => 20, |
| 11 | format.html # index.html.erb | 9 | :order => 'id DESC' |
| 12 | format.xml { render :xml => @assets } | 10 | ) |
| 13 | end | ||
| 14 | end | 11 | end |
| 15 | 12 | ||
| 16 | # GET /assets/1 | 13 | # GET /assets/1 |
