From 23b112aee1979033c58735b1a028cd92210cec09 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Thu, 13 Jun 2013 11:21:32 +0200 Subject: display tenant and user phones combined --- app/controllers/phones_controller.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/phones_controller.rb b/app/controllers/phones_controller.rb index cfa6d7b..77e7b5e 100644 --- a/app/controllers/phones_controller.rb +++ b/app/controllers/phones_controller.rb @@ -9,10 +9,17 @@ class PhonesController < ApplicationController helper_method :sort_column, :sort_descending def index - @phones = @parent.phones.order(sort_column + ' ' + (sort_descending ? 'DESC' : 'ASC')).paginate( - :page => params[:page], - :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE') - ) + if @parent.class == Tenant + @phones = @parent.tenant_user_phones.order(sort_column + ' ' + (sort_descending ? 'DESC' : 'ASC')).paginate( + :page => params[:page], + :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE') + ) + else + @phones = @parent.phones.order(sort_column + ' ' + (sort_descending ? 'DESC' : 'ASC')).paginate( + :page => params[:page], + :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE') + ) + end end def show -- cgit v1.2.3