diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
| commit | 4fcdd330139921b6fa5d4f9d15fb5f91775b27af (patch) | |
| tree | 62e82c385c9a804a8f32da6f276881ff8c21fc90 /app/views/softkeys | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | a865b1f9506b900ed8643c01d94c86268e907720 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app/views/softkeys')
| -rw-r--r-- | app/views/softkeys/_form_core.html.haml | 4 |
1 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 2863d5c..7c1dd4a 100644 --- a/app/views/softkeys/_form_core.html.haml +++ b/app/views/softkeys/_form_core.html.haml @@ -6,7 +6,7 @@ .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 :softkeyable, :collection => @available_call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false + - if @softkey.possible_call_forwards && @softkey.possible_call_forwards.count > 0 + = f.association :softkeyable, :collection => @softkey.possible_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') |