Merge branch 'develop' of github.com:amooma/GS4 into develop

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