diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 12:22:29 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 12:22:29 +0100 |
| commit | 67c1a0a951403a546250ea860a3e3d199cae2fce (patch) | |
| tree | f86ec6cedf081a1a57005eca1661e9bead34e4de /app/views/sip_accounts/_form_core.html.haml | |
| parent | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (diff) | |
| parent | 211f558a86ae30cdd5b392ab1376e1393f97e22c (diff) | |
Merge branch 'develop'5.1-beta6
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 1a8876a..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(:phone_number_id => @sip_account.phone_number_ids).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 |