Use correct release and revision dates.

Thanks to underling for pointing this out

3 files changed, 18 insertions, 3 deletions

diff --git a/app/models/glsa.rb b/app/models/glsa.rb
index 900577c..8038fe2 100644
--- a/app/models/glsa.rb
+++ b/app/models/glsa.rb
@@ -58,6 +58,21 @@ class Glsa < ActiveRecord::Base
     end
   end
 
+  # Returns the best available release date
+  def release_date
+    return first_released_at if status == 'release'
+    last_revision.created_at
+  end
+
+  # Returns the best available revision date
+  def revised_date
+    if status == 'release' and last_revision.created_at < first_released_at
+      first_released_at
+    else
+      last_revision.created_at
+    end
+  end
+
   # Returns all approving comments
   def approvals
     comments.where(:rating => 'approval')
diff --git a/app/views/glsa/_glsa.xml.builder b/app/views/glsa/_glsa.xml.builder
index d268c39..4b13e3f 100644
--- a/app/views/glsa/_glsa.xml.builder
+++ b/app/views/glsa/_glsa.xml.builder
@@ -7,8 +7,8 @@ xml.glsa :id => glsa.glsa_id do
   xml.title rev.title
   xml.synopsis rev.synopsis
   xml.product({:type => "ebuild"}, rev.product)
-  xml.announced rev.created_at.strftime '%B %d, %Y'
-  xml.revised rev.created_at.strftime('%B %d, %Y') + ": #{rev.release_revision || 'draft'}"
+  xml.announced glsa.release_date.strftime '%B %d, %Y'
+  xml.revised glsa.revised_date.strftime('%B %d, %Y') + ": #{rev.release_revision || 'draft'}"
   
   rev.bugs.each do |bug|
     xml.bug bug.bug_id
diff --git a/app/views/glsa/show.txt.erb b/app/views/glsa/show.txt.erb
index 66d9d2f..65c555e 100644
--- a/app/views/glsa/show.txt.erb
+++ b/app/views/glsa/show.txt.erb
@@ -10,7 +10,7 @@ Gentoo Linux Security Advisory                           GLSA <%= @glsa.glsa_id
 
 <%= prefixed_item(" Severity:", @rev.severity.capitalize.html_safe) %>
 <%= prefixed_item("    Title:", @rev.title.html_safe) %>
-<%= prefixed_item("     Date:", @rev.updated_at.strftime('%B %d, %Y')) %>
+<%= prefixed_item("     Date:", @glsa.release_date.strftime('%B %d, %Y')) %>
 <%= prefixed_item("     Bugs:", @rev.bugs.map {|b| "\##{b.bug_id}" }.join(', ')) %>
 <%= prefixed_item("       ID:", @glsa.glsa_id) %>