Skip to content

Commit

Permalink
Expose as a class method
Browse files Browse the repository at this point in the history
  • Loading branch information
cantino committed Jan 8, 2017
1 parent 78f5e6a commit 6c90d4b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions app/helpers/agent_helper.rb
Expand Up @@ -39,6 +39,10 @@ def agent_schedule(agent, delimiter = ', ')
end

def builtin_schedule_name(schedule)
AgentHelper.builtin_schedule_name(schedule)
end

def self.builtin_schedule_name(schedule)
schedule == 'every_7d' ? 'Every Monday' : schedule.humanize.titleize
end

Expand Down
2 changes: 1 addition & 1 deletion app/importers/scenario_import.rb
Expand Up @@ -270,7 +270,7 @@ def update_from!(merges)
def each_field
boolean = [["True", "true"], ["False", "false"]]
yield 'name', name if name.requires_merge?
yield 'schedule', schedule, Agent::SCHEDULES.map {|s| [builtin_schedule_name(s), s] } if self['schedule'].present? && schedule.requires_merge?
yield 'schedule', schedule, Agent::SCHEDULES.map {|s| [AgentHelper.builtin_schedule_name(s), s] } if self['schedule'].present? && schedule.requires_merge?
yield 'keep_events_for', keep_events_for, Agent::EVENT_RETENTION_SCHEDULES if self['keep_events_for'].present? && keep_events_for.requires_merge?
yield 'propagate_immediately', propagate_immediately, boolean if self['propagate_immediately'].present? && propagate_immediately.requires_merge?
yield 'disabled', disabled, boolean if disabled.requires_merge?
Expand Down

0 comments on commit 6c90d4b

Please sign in to comment.