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/views/tenants/_table_of_phones.html.haml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/views/tenants') diff --git a/app/views/tenants/_table_of_phones.html.haml b/app/views/tenants/_table_of_phones.html.haml index 820afc7..9736ece 100644 --- a/app/views/tenants/_table_of_phones.html.haml +++ b/app/views/tenants/_table_of_phones.html.haml @@ -1,9 +1,10 @@ -- cache(['tenant_show_table_of_phones', I18n.locale, tenant, tenant.phones.count, tenant.phones.reorder(:updated_at).last]) do +- phones = @tenant.tenant_user_phones +- cache(['tenant_show_table_of_phones', I18n.locale, tenant, phones.count, phones.reorder(:updated_at).last]) do -# Phones -# %h2= t('phones.index.page_title') - - if @tenant.phones.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "phones/index_core", :phones => tenant.phones + - if phones.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "phones/index_core", :phones => phones, :show_phoneable => true = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => Phone} - else %p -- cgit v1.2.3