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

1 files changed, 10 insertions, 8 deletions

diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index 369a8ce..92614c8 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -1,19 +1,21 @@
 
 .row
   .span12
-    = render :partial => 'tenants/users_table', :locals => {:tenant => tenant}
-    = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant}
-
     = render :partial => 'tenants/table_of_sip_accounts', :locals => {:tenant => tenant}
-    = render :partial => 'tenants/table_of_phones', :locals => {:tenant => tenant}
+    - if SipAccount.any?
+      = render :partial => 'tenants/table_of_phones', :locals => {:tenant => tenant}
 
-    = render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant}
-    = render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant}
-    = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant}
-    = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant}
+    - if SipAccount.any? || Gateway.any?
+      = render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant}
+      = render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant}
+      = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant}
+      = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant}
 
     = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant}
 
+    = render :partial => 'tenants/users_table', :locals => {:tenant => tenant}
+    = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant}
+
     .well
       %h2 Gemeinschaft Konfiguration
       = render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant}