diff --git a/app/helpers/agent_helper.rb b/app/helpers/agent_helper.rb index e51975a865..3dd7ca1364 100644 --- a/app/helpers/agent_helper.rb +++ b/app/helpers/agent_helper.rb @@ -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 diff --git a/app/importers/scenario_import.rb b/app/importers/scenario_import.rb index 9db3f52128..f7465dc3ed 100644 --- a/app/importers/scenario_import.rb +++ b/app/importers/scenario_import.rb @@ -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?