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

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
153c4c24 · Jean-Philippe Lang · 05823373 · 153c4c24 · 153c4c24
Commit 153c4c24 authored Feb 16, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

journal.rb app/models/journal.rb +1 -1

feed.atom.rxml app/views/common/feed.atom.rxml +2 -2

No files found.
--- 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

--- 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)