diff options
| -rw-r--r-- | app/models/journal.rb | 2 | ||||
| -rw-r--r-- | app/views/common/feed.atom.rxml | 4 |
2 files changed, 3 insertions, 3 deletions
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) |