From a59d293070cd0d5d05cbd26fcdeb6d591bf5d22d Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 22 Jan 2017 14:20:47 +0100 Subject: [PATCH] Quick correction to correct an exception when a repetition is set without rule --- app/models/event_callbacks.rb | 2 +- app/views/events/show.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/event_callbacks.rb b/app/models/event_callbacks.rb index ded13174..a7f495aa 100644 --- a/app/models/event_callbacks.rb +++ b/app/models/event_callbacks.rb @@ -16,7 +16,7 @@ class EventCallbacks def self.before_update(event) return unless event.moderated_changed? && event.moderated? event.decision_time = Time.zone.now - create_repeats event if event.repeat > 0 + create_repeats event if event.repeat > 0 && event.rule end def self.after_update(event) diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index ea0ec0be..7640b3cf 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -115,7 +115,7 @@ - @event.tags.each do |tag| = link_to tag, tag_path(tag.name), rel: :tag -- if @event.repeat > 0 +- if @event.repeat > 0 && @event.rule %h3 %em.fa.fa-repeat = @event.schedule