From a2dbade55de4cec0ca8e0ef1fb61e0ee4bf96543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E5=BF=83?= <41134017+Lhcfl@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:54:30 +0800 Subject: [PATCH] FIX: Prevent group requests from loading infinitely (#28544) In GroupRequestsController, request_count is incorrectly written as user_count, which causes group member requests to be loaded infinitely when user_count is greater than request_count. --- .../javascripts/discourse/app/controllers/group-requests.js | 4 +++- .../discourse/tests/acceptance/group-requests-test.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js index 7ea4f092060..34ff0154e12 100644 --- a/app/assets/javascripts/discourse/app/controllers/group-requests.js +++ b/app/assets/javascripts/discourse/app/controllers/group-requests.js @@ -16,7 +16,9 @@ export default class GroupRequestsController extends Controller { loading = false; get canLoadMore() { - return this.get("model.requesters")?.length < this.get("model.user_count"); + return ( + this.get("model.requesters")?.length < this.get("model.request_count") + ); } @observes("filterInput") diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js index beebe80cd93..c7f0782f26e 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js @@ -19,7 +19,7 @@ acceptance("Group Requests", function (needs) { id: 42, automatic: false, name: "Macdonald", - user_count: 1, + user_count: 10, mentionable_level: 0, messageable_level: 0, visibility_level: 0,