diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
| commit | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (patch) | |
| tree | 49ed889b1d10cda98c475f3453abff1b97afb4e7 /app/views/sip_accounts | |
| parent | c9066760fd1f5f2f892ce2be5cf2a83bb5210246 (diff) | |
| parent | 55784bcffc0678ce6102c0b81447434a8030ebd2 (diff) | |
Merge branch 'develop'5.1-beta5
Diffstat (limited to 'app/views/sip_accounts')
| -rw-r--r-- | app/views/sip_accounts/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/sip_accounts/_form_core.html.haml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/sip_accounts/_form.html.haml b/app/views/sip_accounts/_form.html.haml index f209bf4..d40ce10 100644 --- a/app/views/sip_accounts/_form.html.haml +++ b/app/views/sip_accounts/_form.html.haml @@ -3,5 +3,5 @@ = render "form_core", :f => f - .actions - = f.button :submit, conditional_t('sip_accounts.form.submit')
\ No newline at end of file + .form-actions + = f.button :submit, conditional_t('sip_accounts.form.submit') diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml index 1b96d27..1a8876a 100644 --- a/app/views/sip_accounts/_form_core.html.haml +++ b/app/views/sip_accounts/_form_core.html.haml @@ -15,3 +15,4 @@ = 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 |