summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-15 16:08:20 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-15 16:08:20 +0100
commit55784bcffc0678ce6102c0b81447434a8030ebd2 (patch)
tree49ed889b1d10cda98c475f3453abff1b97afb4e7
parente5e1f49fb03989a4b69ed88bf7eb7a909c659a18 (diff)
parent8474fe8ce8fe660ae65a59ed4fcad31c2e5647a2 (diff)
Merge branch 'sim_card' into develop
-rw-r--r--app/views/users/show.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index dca8cff..0f6cc2c 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -70,7 +70,8 @@
- if GsParameter.get('SIM_CARDS') == true
- cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.sim_cards]) do
%h2=t('sim_cards.index.page_title')
- = render :partial => 'sim_cards/index_core', :locals => {:parent => @user.sim_cards.first.sim_card_provider, :sim_cards => @user.sim_cards}
+ = render :partial => 'sim_cards/index_core', :locals => {:parent => SimCardProvider.first, :sim_cards => @user.sim_cards}
+ = render :partial => 'shared/create_link', :locals => {:parent => SimCardProvider.first, :child_class => SimCard}
- cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
= render :partial => 'fax_accounts', :locals => {:user => @user}