summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-05-17 09:35:24 +0200
committerPeter Kozak <spag@golwen.net>2013-05-17 09:35:24 +0200
commit45347d2094d79eaecb3df7d234b9bd7e436275c7 (patch)
tree8c8696bca22c2ea8a61f6a05fa55c6a286ba2d0b /app/controllers
parentca490d7215ffb6015573b690cd5b1a53d9b67e34 (diff)
parent6a1961283914a6b87400bf0b7b492fa9f8692c03 (diff)
Merge branch 'develop' of github.com:amooma/GS4 into develop
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/call_routes_controller.rb2
-rw-r--r--app/controllers/sip_accounts_controller.rb2
-rw-r--r--app/controllers/users_controller.rb2
3 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb
index e5cf56a..528081a 100644
--- a/app/controllers/call_routes_controller.rb
+++ b/app/controllers/call_routes_controller.rb
@@ -92,6 +92,8 @@ class CallRoutesController < ApplicationController
account = SipAccount.where(:id => params[:sip_account_id]).first
elsif !params[:hunt_group_id].blank?
account = HuntGroup.where(:id => params[:hunt_group_id]).first
+ elsif !params[:fax_account_id].blank?
+ account = FaxAccount.where(:id => params[:fax_account_id]).first
end
if account
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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 971ce4b..b4ef180 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -10,7 +10,7 @@ class UsersController < ApplicationController
def index
@users = @parent.users.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