Reverted change to alert_changed now there's the validation monkey

patch in places.

1 files changed, 4 insertions, 16 deletions

diff --git a/lib/mauve/alert_changed.rb b/lib/mauve/alert_changed.rb
index b76df58..3c5fa0f 100644
--- a/lib/mauve/alert_changed.rb
+++ b/lib/mauve/alert_changed.rb
@@ -108,22 +108,10 @@ module Mauve
       #
       self.remind_at = nil
 
-      unless self.save
-        #
-        # If the save has failed due to validation errors, but there aren't
-        # actually any errors, just save, by-passing validation.
-        #
-        if self.respond_to?("errors") and self.errors.is_a?(DataMapper::Validations::ValidationErrors) and self.errors.errors.empty?
-          logger.debug "Failed to save #{self.inspect} due to unexplained validation error. Saving again skipping validation."
-          self.save!
-          return true
-        else
-          logger.warn "Failed to clear #{self.inspect}, due to #{self.errors.inspect} -- this will lead to duplicate reminders."
-          return false
-        end
-      end
-
-      return true
+      #
+      # Now save.
+      #
+      return self.save
     end
     
     # The time this AlertChanged should next be polled at, or nil.  Mimics