From 6394e934b2ad861202948e909617dbc10be17f1b Mon Sep 17 00:00:00 2001 From: Adam Ruzicka Date: Mon, 27 Feb 2017 13:22:48 +0100 Subject: [PATCH] Fixes #18515 - add scheduling helpers --- app/models/foreman_tasks/task.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/foreman_tasks/task.rb b/app/models/foreman_tasks/task.rb index c66449666..18bd68c59 100644 --- a/app/models/foreman_tasks/task.rb +++ b/app/models/foreman_tasks/task.rb @@ -69,7 +69,7 @@ def username end def execution_type - start_at.to_i == started_at.to_i ? N_('Immediate') : N_('Delayed') + delayed? ? N_('Delayed') : N_('Immediate') end def humanized @@ -96,6 +96,14 @@ def paused? state == 'paused' end + def recurring? + !recurring_logic_task_group_ids.empty? + end + + def delayed? + start_at.to_i != started_at.to_i + end + def self_and_parents [self].tap do |ret| ret.concat(parent_task.self_and_parents) if parent_task