Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

If schedule is a hash on the model, then need to check for empty hash as well #36

Merged
merged 1 commit into from
Oct 28, 2013
Merged

If schedule is a hash on the model, then need to check for empty hash as well #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/helpers/utilities/form_options_ext.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def recurring_options_for_select(currently_selected_rule = nil, default_schedule
separator = [I18n.t("recurring_select.or"), {:disabled => true}]

if default_schedules.blank?
if currently_selected_rule
if not currently_selected_rule.blank?
options_array << blank_option if options[:allow_blank]
options_array << ice_cube_rule_to_option(currently_selected_rule)
options_array << separator
Expand All @@ -24,7 +24,7 @@ def recurring_options_for_select(currently_selected_rule = nil, default_schedule
ice_cube_rule_to_option(dc)
}

if currently_selected_rule and not current_rule_in_defaults?(currently_selected_rule, default_schedules)
if not currently_selected_rule.blank? and not current_rule_in_defaults?(currently_selected_rule, default_schedules)
options_array << ice_cube_rule_to_option(currently_selected_rule, true)
custom_label = [I18n.t("recurring_select.new_custom_schedule"), "custom"]
else
Expand Down