From 1bfcf2e69988147604b0aa7ce145c64a98e7ad86 Mon Sep 17 00:00:00 2001 From: Sasha Romijn Date: Fri, 14 Feb 2020 13:39:42 +0000 Subject: [PATCH] Fix issue in [17289] where wg_adjacent could be shown as a conflict. - Legacy-Id: 17293 Note: SVN reference [17289] has been migrated to Git commit a227813dc5b712a0cd7e45f440fc86eda4f690ac --- ietf/secr/sreq/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index 7b4720046..935a9957c 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -173,7 +173,8 @@ def session_conflicts_as_string(group, meeting): Takes a Group object and Meeting object and returns a string of other groups which have a conflict with this one ''' - group_list = [ g.source.acronym for g in group.constraint_target_set.filter(meeting=meeting) ] + groups = group.constraint_target_set.filter(meeting=meeting, name__in=['conflict', 'conflic2', 'conflic3']) + group_list = [g.source.acronym for g in groups] return ', '.join(group_list) # -------------------------------------------------