summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-17 11:05:21 +0100
committerspag <spag@golwen.net>2013-01-17 11:05:21 +0100
commitf08ec4598b9efcab4692ffa0a355da284fbfd5c2 (patch)
treedb27cdc09b6f0836094defa2f0b96f4f3f3675a8 /app/views/users
parentbc530494cca59845b5896ae4b0900ca1b9691827 (diff)
parentc09073174bb51561030a48f95f283b63b0ddae34 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.haml18
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}