diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 10:48:43 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 10:48:43 +0100 |
| commit | ececfdf24075dd4e2794734a07187750b1b33e13 (patch) | |
| tree | 63538e6f6135ce031da830da0ca6e14515e776e1 /app/views/sip_accounts/_form_core.html.haml | |
| parent | b144a7885610d605447c80f659643524a839db0c (diff) | |
| parent | ad2121462a9ea9a776756a188779a9d504f078b7 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/sip_accounts/_form_core.html.haml')
| -rw-r--r-- | app/views/sip_accounts/_form_core.html.haml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml index 1a09912..d7c65d0 100644 --- a/app/views/sip_accounts/_form_core.html.haml +++ b/app/views/sip_accounts/_form_core.html.haml @@ -13,6 +13,4 @@ - if @sip_account.sip_accountable_type == 'User' = f.input :hotdeskable, :label => t('sip_accounts.form.hotdeskable.label'), :hint => conditional_hint('sip_accounts.form.hotdeskable.hint') = f.input :clip_no_screening, :label => t('sip_accounts.form.clip_no_screening.label'), :hint => conditional_hint('sip_accounts.form.clip_no_screening.hint') - - if CallForward.where(:call_forwardable_id => @sip_account.phone_number_ids, :call_forwardable_type => 'PhoneNumber').count == 0 || @sip_account.callforward_rules_act_per_sip_account == true - = f.input :callforward_rules_act_per_sip_account, :label => t('sip_accounts.form.callforward_rules_act_per_sip_account.label'), :hint => conditional_hint('sip_accounts.form.callforward_rules_act_per_sip_account.hint') = f.input :language_code, :collection => Language.all.collect{|l| [l.to_s, l.code]}, :label => t('sip_accounts.form.language_code.label'), :hint => conditional_hint('sip_accounts.form.language_id.hint'), :include_blank => false |