mirror of
https://github.com/opf/openproject.git
synced 2026-06-13 19:20:00 +00:00
Merge pull request #23686 from opf/bug/op-19061-meeting-not-shown-at-all-meetings-if-meeting-creator-is-not-marked-as-participated
[OP-19496] Meeting not shown in "All meetings" in the meetings index page if there are no participants
This commit is contained in:
@@ -78,7 +78,7 @@ module Meetings
|
||||
end
|
||||
|
||||
def all_meetings_item
|
||||
all_filter = [{ invited_user_id: { operator: "*", values: [] } }].to_json
|
||||
all_filter = [].to_json
|
||||
my_meetings_href = polymorphic_path([project, :meetings])
|
||||
query_params = { filters: all_filter }
|
||||
|
||||
|
||||
@@ -130,6 +130,13 @@ RSpec.describe "Meetings", "Index", :js do
|
||||
|
||||
shared_examples "sidebar filtering" do |context:|
|
||||
context "when showing all meetings without invitations" do
|
||||
let!(:meeting_without_participants) do
|
||||
create(:meeting,
|
||||
project:,
|
||||
title: "Meeting without any participants!",
|
||||
start_time: business_day_at_noon + 3.hours).tap { |m| m.participants.delete_all }
|
||||
end
|
||||
|
||||
it "does not show under My meetings, but in All meetings" do
|
||||
meetings_page.visit!
|
||||
meetings_page.expect_no_meetings_listed
|
||||
@@ -137,12 +144,15 @@ RSpec.describe "Meetings", "Index", :js do
|
||||
|
||||
meetings_page.set_sidebar_filter "All meetings"
|
||||
|
||||
# It now includes the ongoing meeting I'm not invited to
|
||||
if context == :global
|
||||
[ongoing_meeting, meeting, tomorrows_meeting, other_project_meeting]
|
||||
else
|
||||
[ongoing_meeting, meeting, tomorrows_meeting]
|
||||
end
|
||||
# It now includes the ongoing meeting I'm not invited to,
|
||||
# as well as meetings without any invited participants
|
||||
expected_meetings =
|
||||
if context == :global
|
||||
[ongoing_meeting, meeting, meeting_without_participants, tomorrows_meeting, other_project_meeting]
|
||||
else
|
||||
[ongoing_meeting, meeting, meeting_without_participants, tomorrows_meeting]
|
||||
end
|
||||
meetings_page.expect_meetings_listed(*expected_meetings)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -182,8 +192,12 @@ RSpec.describe "Meetings", "Index", :js do
|
||||
it "show all past meetings" do
|
||||
meetings_page.expect_meetings_listed_in_table(yesterdays_meeting, meeting, ongoing_meeting)
|
||||
meetings_page.expect_meetings_not_listed(tomorrows_meeting)
|
||||
end
|
||||
|
||||
it "keeps the past filter selected when changing advanced filters (Regression #61875)" do
|
||||
meetings_page.set_sidebar_filter "My meetings"
|
||||
meetings_page.set_quick_filter upcoming: false
|
||||
|
||||
# keeps the past filter selected when changing advanced filters (Regression #61875)" do
|
||||
meetings_page.open_filters
|
||||
meetings_page.remove_filter "invited_user_id"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user