diff options
| author | Peter Kozak <spag@golwen.net> | 2013-05-17 09:35:24 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-05-17 09:35:24 +0200 |
| commit | 45347d2094d79eaecb3df7d234b9bd7e436275c7 (patch) | |
| tree | 8c8696bca22c2ea8a61f6a05fa55c6a286ba2d0b /app/controllers/sip_accounts_controller.rb | |
| parent | ca490d7215ffb6015573b690cd5b1a53d9b67e34 (diff) | |
| parent | 6a1961283914a6b87400bf0b7b492fa9f8692c03 (diff) | |
Merge branch 'develop' of github.com:amooma/GS4 into develop
Diffstat (limited to 'app/controllers/sip_accounts_controller.rb')
| -rw-r--r-- | app/controllers/sip_accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index 8e88405..32d1210 100644 --- a/app/controllers/sip_accounts_controller.rb +++ b/app/controllers/sip_accounts_controller.rb @@ -10,7 +10,7 @@ class SipAccountsController < ApplicationController def index @sip_accounts = @parent.sip_accounts.order(sort_column + ' ' + (sort_descending ? 'DESC' : 'ASC')).paginate( - :page => @pagination_page_number, + :page => params[:page], :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE') ) end |