Skip to content

Commit fcddc86

Browse files
committed
Fixed some incorrect topic audience id slugs, to make the topic availability filtering work correctly.
- Legacy-Id: 15598
1 parent 2a6d6b6 commit fcddc86

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

ietf/nomcom/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ def testTopicFeedback(self):
20742074
self.assertEqual(topic.feedback_set.count(),1)
20752075

20762076
def testAudience(self):
2077-
for audience in ['nomcom','nominee']:
2077+
for audience in ['nomcom','nominees']:
20782078
topic = TopicFactory(nomcom=self.nc,audience_id=audience)
20792079
feedback_url = reverse('ietf.nomcom.views.public_feedback',kwargs={'year':self.nc.year() })
20802080
login_testing_unauthorized(self, self.plain_person.user.username, feedback_url)

ietf/nomcom/views.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ def feedback(request, year, public):
455455
topic = get_object_or_404(Topic,id=selected_topic)
456456
if topic.audience_id == 'nomcom' and not nomcom.group.has_role(request.user, ['chair','advisor','liaison','member']):
457457
raise Http404()
458-
if topic.audience_id == 'nominee' and not nomcom.nominee_set.filter(person=request.user.person).exists():
458+
if topic.audience_id == 'nominees' and not nomcom.nominee_set.filter(person=request.user.person).exists():
459459
raise Http404()
460460

461461
if public:
@@ -468,8 +468,7 @@ def feedback(request, year, public):
468468
if not nomcom.group.has_role(request.user, ['chair','advisor','liaison','member']):
469469
topics = topics.exclude(audience_id='nomcom')
470470
if not nomcom.nominee_set.filter(person=request.user.person).exists():
471-
topics = topics.exclude(audience_id='nominee')
472-
471+
topics = topics.exclude(audience_id='nominees')
473472

474473
user_comments = Feedback.objects.filter(nomcom=nomcom,
475474
type='comment',

0 commit comments

Comments
 (0)