From debded63c18e4cb01faa8306c727c0c0472852bc Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Wed, 5 Dec 2012 12:31:08 +0000
Subject: Make sure the update_type is always set on save.

---
 lib/mauve/alert.rb | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index cbf4a40..82f9e91 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -208,11 +208,6 @@ module Mauve
     # @return [String]
     def detail;  super || "_No detail set._" ; end
 
-    #
-    # The update type
-    #
-    def update_type; super || "cleared" ; end
-
     #
     # Set the subject -- this clears the cached_alert_group.
     #
@@ -338,10 +333,7 @@ module Mauve
 
       history = nil
 
-      if ut.nil?
-        self.update_type = "cleared" if self.new? or self.update_type.nil?
-
-      else
+      unless ut.nil?
         self.update_type = ut
 
         history = History.new(:alerts => [self], :type => "update")
@@ -364,6 +356,11 @@ module Mauve
         end
       end
 
+      #
+      # Make sure the update type is always set.
+      #
+      self.update_type = "cleared" if self.update_type.nil?
+
       self.raise_on_save_failure = true
 
       begin
-- 
cgit v1.2.3