3 files changed, 4 insertions, 6 deletions
diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index ed2b1dd..8585767 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -284,7 +284,7 @@ module Mauve
     end
 
     def do_set_timestamps(context = :default)
-      self.updated_at = Time.now unless self.original_attributes.has_key?("updated_at")
+      self.updated_at = Time.now if self.dirty?
     end
    
     # This is to stop datamapper inserting duff dates into the database.
@@ -364,9 +364,7 @@ module Mauve
 
         end
 
-        if !h.save
-          logger.error "Unable to save history due to #{h.errors.inspect}"
-        end
+        h.save
       end
 
       true
diff --git a/lib/mauve/alert_changed.rb b/lib/mauve/alert_changed.rb
index 3c5fa0f..6f1a717 100644
--- a/lib/mauve/alert_changed.rb
+++ b/lib/mauve/alert_changed.rb
@@ -28,7 +28,7 @@ module Mauve
     protected
 
     def do_set_timestamps(context = :default)
-      self.at = Time.now unless self.original_attributes.has_key?("at")
+      self.at = Time.now if self.dirty?
     end
 
     public
diff --git a/lib/mauve/history.rb b/lib/mauve/history.rb
index bcdd41a..1e683d2 100644
--- a/lib/mauve/history.rb
+++ b/lib/mauve/history.rb
@@ -111,7 +111,7 @@ module Mauve
     # Update the created_at time on the object
     #
     def do_set_created_at(context = :default)
-      self.created_at = Time.now unless self.created_at.is_a?(Time) 
+      self.created_at = Time.now if self.new?
     end
 
     public