diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 15:04:07 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 15:04:07 +0100 |
| commit | 714fd5feb8551159bcdb982e42ff4585635db209 (patch) | |
| tree | 9442c98cd9e7bf95f48e36b7d3220be6f4cb0e7c /app/views/sim_cards | |
| parent | 72a56d20496e58a1d1debc3a859d40aa73e246b5 (diff) | |
| parent | 14e8e9923666991703f747a4abfd6fbfb96d2dc1 (diff) | |
Merge branch 'sim_card' into develop
Diffstat (limited to 'app/views/sim_cards')
| -rw-r--r-- | app/views/sim_cards/_form_core.html.haml | 2 | ||||
| -rw-r--r-- | app/views/sim_cards/_index_core.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/sim_cards/_form_core.html.haml b/app/views/sim_cards/_form_core.html.haml index 7cba4e9..7223294 100644 --- a/app/views/sim_cards/_form_core.html.haml +++ b/app/views/sim_cards/_form_core.html.haml @@ -1,3 +1,3 @@ .inputs - = f.input :sim_number, :label => t('sim_cards.form.sim_number.label'), :hint => conditional_hint('sim_cards.form.sim_number.hint') + = f.input :sim_number, :label => t('sim_cards.form.sim_number.label'), :hint => conditional_hint('sim_cards.form.sim_number.hint'), :autofocus => true = f.association :sip_account, :collection => @available_sip_accounts, :label => t('phone_sip_accounts.form.sip_account_id.label'), :hint => conditional_hint('phone_sip_accounts.form.sip_account_id.hint'), :include_blank => false
\ No newline at end of file diff --git a/app/views/sim_cards/_index_core.html.haml b/app/views/sim_cards/_index_core.html.haml index c36b22b..460c8ba 100644 --- a/app/views/sim_cards/_index_core.html.haml +++ b/app/views/sim_cards/_index_core.html.haml @@ -13,4 +13,4 @@ = render 'phone_numbers/listing', :phone_numbers => sim_card.sip_account.phone_numbers.order(:number) %td= sim_card.auth_key %td= sim_card.state - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @parent, :child => sim_card}
\ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => sim_card.sim_card_provider, :child => sim_card}
\ No newline at end of file |