Project

General

Profile

Feature #15212 » 15212-v2.patch

Go MAEDA, 2020-12-08 03:25

View differences:

app/views/common/feed.atom.builder
36 36
  @items.each do |item|
37 37
    xml.entry do
38 38
      url = url_for(item.event_url(:only_path => false, :protocol => protocol, :host => host))
39
      if @project
39
      if @project == item.project
40 40
        xml.title truncate_single_line_raw(item.event_title, 100)
41 41
      else
42 42
        xml.title truncate_single_line_raw("#{item.project} - #{item.event_title}", 100)
test/functional/activities_controller_test.rb
181 181
    assert_select 'title', :text => "Redmine: #{User.find(2).name}"
182 182
  end
183 183

  
184
  def test_index_atom_feed_with_subprojects
185
    get(
186
      :index,
187
      :params => {
188
        :format => 'atom',
189
        :id => 'ecookbook',
190
        :with_subprojects => 1,
191
        :show_issues => 1
192
      }
193
    )
194
    assert_response :success
195

  
196
    assert_select 'feed' do
197
      # eCookbook
198
      assert_select 'title', text: 'Bug #1: Cannot print recipes'
199
      # eCookbook Subproject 1
200
      assert_select 'title', text: 'eCookbook Subproject 1 - Bug #5 (New): Subproject issue'
201
    end
202
  end
203

  
184 204
  def test_index_should_show_private_notes_with_permission_only
185 205
    journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes', :private_notes => true)
186 206
    @request.session[:user_id] = 2
(2-2/2)