Fixes #25562 - Product rendering issue when no recurring logic

Katello · Nov 27, 2018 · df3dce6 · df3dce6
1 parent 095a037
commit df3dce6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/models/katello/sync_plan.rb b/app/models/katello/sync_plan.rb
@@ -118,8 +118,13 @@ def sync_time
     end
 
     def next_sync_date
-      return nil unless (self.enabled || !self.foreman_tasks_recurring_logic.tasks.nil?)
-      self.foreman_tasks_recurring_logic.tasks.order(:start_at).last.try(:start_at)
+      return nil if (self.foreman_tasks_recurring_logic.try(:tasks).nil? || !self.enabled )
+      begin
+        self.foreman_tasks_recurring_logic.tasks.order(:start_at).last.try(:start_at)
+      rescue Exception => e
+        Rails.logger.error "Error fetching next sync date for #{self.name} : " + e.message.to_s
+        nil
+      end
     end
 
     def next_sync