Version bumb

5 files changed, 36 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index c3a26ee..1fd50cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mauvealert (3.5.8) stable; urgency=low
+
+  *  Added rescue clause to XMPP connect
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 13 Sep 2011 07:56:38 +0100
+
 mauvealert (3.5.7) stable; urgency=low
 
   * Reminders are now unconditionally cleared when an alert is cleared.
diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index ecea4e6..fa2ce65 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -223,7 +223,8 @@ module Mauve
         h = History.new(:alerts => [self], :type => "update")
 
         if self.update_type == "acknowledged"
-          h.event = "ACKNOWLEDGED by #{self.acknowledged_by} until #{self.will_unacknowledge_at}"
+          h.event = "ACKNOWLEDGEDuntil #{self.will_unacknowledge_at}"
+          h.user  = self.acknowledged_by
 
         elsif is_a_change
           h.event = "CHANGED: "
diff --git a/lib/mauve/history.rb b/lib/mauve/history.rb
index 5a0caff..76025a0 100644
--- a/lib/mauve/history.rb
+++ b/lib/mauve/history.rb
@@ -24,8 +24,8 @@ module Mauve
         # 
         # This is horrid. FIXME!
         #
-        history_schema = '"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "type" VARCHAR(50) DEFAULT \'unknown\' NOT NULL, "event" TEXT DEFAULT \'Nothing set\' NOT NULL, "created_at" TIMESTAMP NOT NULL'
-        history_cols   = 'id, type, event, created_at'
+        history_schema = '"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, "type" VARCHAR(50) DEFAULT \'unknown\' NOT NULL, "event" TEXT DEFAULT \'Nothing set\' NOT NULL, "user" VARCHAR(50) DEFAULT NULL, "created_at" TIMESTAMP NOT NULL'
+        history_cols   = 'id, type, event, user, created_at'
         ##
         # Now adjust the Histories table to remove its alert_id col
         #
@@ -63,6 +63,7 @@ module Mauve
     property :id, Serial
     property :type,  String, :required => true, :default => "unknown", :lazy => false
     property :event, Text, :required => true, :default => "Nothing set", :lazy => false
+    property :user, String
     property :created_at, Time, :required => true
 
     has n, :alerts, :through => :alerthistory
diff --git a/lib/mauve/version.rb b/lib/mauve/version.rb
index e6b6eb4..56ac522 100644
--- a/lib/mauve/version.rb
+++ b/lib/mauve/version.rb
@@ -1,5 +1,5 @@
 module Mauve
 
-  VERSION="3.5.7"
+  VERSION="3.5.8"
 
 end
diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb
index 928340c..707014a 100644
--- a/lib/mauve/web_interface.rb
+++ b/lib/mauve/web_interface.rb
@@ -507,7 +507,31 @@ EOF
 
       haml :events_list
     end
+
+    get '/search' do
+      @alerts = []
+      haml :search
+    end
  
+    get '/search/results' do
+      query = {}
+      allowed = %w(source subject alert_id summary)
+
+      params.each do |k,v|
+        next if v.to_s.empty?
+        query[k.to_sym.send("like")] = v.to_s if allowed.include?(k)
+      end
+
+      @alerts = Alert.all(query)
+
+      haml :search
+    end
+
+    post '/suppress' do
+      haml :suppress
+    end
+
+
     ########################################################################
     
     helpers do