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

1 files changed, 8 insertions, 10 deletions

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index f74d0a5..9a0ae02 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -47,16 +47,14 @@
       - cache(['user_show_user_groups_overview', I18n.locale, @user, @user.user_groups]) do
         = render :partial => 'user_groups', :locals => {:user => @user, :tenant => @tenant}
 
-    - cache(['user_show_overview_for_sip_account_phones_fax_accounts_and_conferences', I18n.locale, @user, @user.sip_accounts, @user.phones, @user.fax_accounts, @user.conferences]) do
+    - cache(['user_show_sip_accounts_overview', I18n.locale, @user, @user.sip_accounts]) do
+      = render :partial => 'sip_accounts', :locals => {:user => @user}
 
-      - cache(['user_show_sip_accounts_overview', I18n.locale, @user, @user.sip_accounts]) do
-        = render :partial => 'sip_accounts', :locals => {:user => @user}
+    - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do
+      = render :partial => 'phones', :locals => {:user => @user}
 
-      - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do
-        = render :partial => 'phones', :locals => {:user => @user}
+    - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
+      = render :partial => 'fax_accounts', :locals => {:user => @user}
 
-      - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
-        = render :partial => 'fax_accounts', :locals => {:user => @user}
-
-      - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do
-        = render :partial => 'conferences', :locals => {:user => @user}
+    - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do
+      = render :partial => 'conferences', :locals => {:user => @user}