From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 16:20:35 +0000 (+0000)
Subject: Atom feeds:
X-Git-Tag: 0.7.0-RC1~133
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=153c4c242d7ade5f9c35fe75090bcb170c26ab96;p=redmine.git

Atom feeds:
* prevent duplicate entry ids for issue changes
* prevent empty email in author element

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1154 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 013e2644d..5aebbb7ce 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -32,7 +32,7 @@ class Journal < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
                 :description => :notes,
                 :author => :user,
-                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id}}
+                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
 
   def save
     # Do not save an empty journal
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 59b3163f4..6695565f4 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -15,8 +15,8 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       xml.updated item.event_datetime.xmlschema
       author = item.event_author if item.respond_to?(:author)
       xml.author do
-        xml.name(author.is_a?(User) ? author.name : author)
-        xml.email(author.mail) if author.is_a?(User)
+        xml.name(author)
+        xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
       end if author
       xml.content "type" => "html" do
         xml.text! textilizable(item.event_description)