summaryrefslogtreecommitdiffstats
path: root/app/views/common
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-12-14 01:25:34 +0000
committerGo MAEDA <maeda@farend.jp>2020-12-14 01:25:34 +0000
commit36274a95e9bd06a7e2d8b1a10c4238e9bb8106c2 (patch)
treeae99798695c60a6fa71abdf95084feb3a4270bf1 /app/views/common
parentb257abec9c0cdc233d4c24f3a6948a20452296a7 (diff)
downloadredmine-36274a95e9bd06a7e2d8b1a10c4238e9bb8106c2.tar.gz
redmine-36274a95e9bd06a7e2d8b1a10c4238e9bb8106c2.zip
Atom feed on project with subprojects should show in article title the name of the project (#15212).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@20648 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
-rw-r--r--app/views/common/feed.atom.builder2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder
index d7f4c8b00..0fbe1063c 100644
--- a/app/views/common/feed.atom.builder
+++ b/app/views/common/feed.atom.builder
@@ -36,7 +36,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
@items.each do |item|
xml.entry do
url = url_for(item.event_url(:only_path => false, :protocol => protocol, :host => host))
- if @project
+ if @project == item.project
xml.title truncate_single_line_raw(item.event_title, 100)
else
xml.title truncate_single_line_raw("#{item.project} - #{item.event_title}", 100)