summaryrefslogtreecommitdiff
path: root/app/views/softkeys
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/softkeys')
-rw-r--r--app/views/softkeys/_form_core.html.haml2
-rw-r--r--app/views/softkeys/_index_core.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/softkeys/_form_core.html.haml b/app/views/softkeys/_form_core.html.haml
index b833aad..2863d5c 100644
--- a/app/views/softkeys/_form_core.html.haml
+++ b/app/views/softkeys/_form_core.html.haml
@@ -7,6 +7,6 @@
.inputs
= f.input :softkey_function_id, :as => :select, :collection => @softkey_functions.map {|x| [I18n.t("softkeys.functions.#{x}"), x.id] }, :label => t('softkeys.form.function.label'), :hint => conditional_hint('softkeys.form.function.hint'), :include_blank => false
- if @available_call_forwards && @available_call_forwards.count > 0
- = f.association :call_forward, :collection => @available_call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
+ = f.association :softkeyable, :collection => @available_call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
= f.input :number, :label => t('softkeys.form.number.label'), :hint => conditional_hint('softkeys.form.number.hint')
= f.input :label, :label => t('softkeys.form.label.label'), :hint => conditional_hint('softkeys.form.label.hint')
diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml
index e2cb16c..4a06c72 100644
--- a/app/views/softkeys/_index_core.html.haml
+++ b/app/views/softkeys/_index_core.html.haml
@@ -15,7 +15,7 @@
- if softkeys.count > 1
%span.handle
%i.icon-resize-vertical
- %td= softkey.function
+ %td= t("softkeys.functions.#{softkey.softkey_function}")
%td= softkey.number
%td= softkey.label
=render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => softkey.sip_account, :child => softkey} \ No newline at end of file