Project

General

Profile

Actions

Defect #34933

closed

Atom feed of the activity page does not contain items after the second page

Added by Yuichi HARADA almost 3 years ago. Updated almost 3 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Category:
Activity view
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

I'm receiving Atom feeds on the Activity.
I thought I was receiving the number of feeds set in Administration > Settings > General > Maximum number of items in Atom feeds, but actually I received only the events displayed on the first page of the Activity.


Files

34933.patch (1.49 KB) 34933.patch Yuichi HARADA, 2021-03-19 06:48
34933-v2.patch (1.48 KB) 34933-v2.patch Go MAEDA, 2021-04-09 07:22

Related issues

Related to Redmine - Patch #35413: Add missing fixtures to ActivitiesControllerTestClosedGo MAEDA

Actions
Actions #1

Updated by Yuichi HARADA almost 3 years ago

I created a patch.

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 745a40219..e1bba49f6 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -55,7 +55,12 @@ class ActivitiesController < ApplicationController
       end
     end

-    events = @activity.events(@date_from, @date_to)
+    events =
+      if params[:format] == 'atom'
+        @activity.events(nil, nil, :limit => Setting.feeds_limit.to_i)
+      else
+        @activity.events(@date_from, @date_to)
+      end

     if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
       respond_to do |format|
Actions #2

Updated by Go MAEDA almost 3 years ago

  • Status changed from New to Confirmed
  • Target version set to Candidate for next minor release
Actions #3

Updated by Go MAEDA almost 3 years ago

  • File 34933-v2.patch 34933-v2.patch added
  • Subject changed from Received Atom feed entries only of the first page of Activity to Atom feed of the activity page does not contain items after the second page
  • Target version changed from Candidate for next minor release to 4.1.3

In 34933-v2.patch, I have changed the test name.

Actions #4

Updated by Go MAEDA almost 3 years ago

  • Status changed from Confirmed to Resolved
  • Assignee set to Go MAEDA
  • Resolution set to Fixed

Committed the patch. Thank you.

Actions #5

Updated by Go MAEDA almost 3 years ago

  • Status changed from Resolved to Closed
Actions #6

Updated by Go MAEDA over 2 years ago

  • Related to Patch #35413: Add missing fixtures to ActivitiesControllerTest added
Actions

Also available in: Atom PDF