summaryrefslogtreecommitdiff
path: root/app/views/softkeys
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-07 07:38:44 -0500
committerPeter Kozak <spag@golwen.net>2013-03-07 07:38:44 -0500
commit678baf479066ad6b517b3a97925a7e37bf5327e4 (patch)
treeaebfc00389fefd2fc136cc50ae5eccf5b17f9fd0 /app/views/softkeys
parent3cf3b921ee398472f2663cc1210932429f7710d9 (diff)
softkey form fixed
Diffstat (limited to 'app/views/softkeys')
-rw-r--r--app/views/softkeys/_form_core.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/softkeys/_form_core.html.haml b/app/views/softkeys/_form_core.html.haml
index f447aa6..0e251f3 100644
--- a/app/views/softkeys/_form_core.html.haml
+++ b/app/views/softkeys/_form_core.html.haml
@@ -4,10 +4,11 @@
hold_function_name = "#{I18n.t('softkeys.functions.hold')}"
deactivated_function_name = "#{I18n.t('softkeys.functions.deactivated')}"
+
.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
- call_forwards = @softkey.possible_call_forwards
- if call_forwards && call_forwards.count > 0
- = f.association :softkeyable, :collection => call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
+ = f.input :softkeyable_id, :collection => 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')