altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 6 Packages Projects Releases Wiki Activity

Fixed some incorrect topic audience id slugs, to make the topic availability filtering work correctly.

Browse source 
- Legacy-Id: 15598
This commit is contained in:
Henrik Levkowetz 2018-10-19 12:53:16 +00:00
parent 2a6d6b6417
commit fcddc86447
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/nomcom/tests.py
View file

@ -2074,7 +2074,7 @@ class TopicTests(TestCase):
self.assertEqual(topic.feedback_set.count(),1)
def testAudience(self):
for audience in ['nomcom','nominee']:
for audience in ['nomcom','nominees']:
topic = TopicFactory(nomcom=self.nc,audience_id=audience)
feedback_url = reverse('ietf.nomcom.views.public_feedback',kwargs={'year':self.nc.year() })
login_testing_unauthorized(self, self.plain_person.user.username, feedback_url)

5
ietf/nomcom/views.py
View file

@ -455,7 +455,7 @@ def feedback(request, year, public):
topic = get_object_or_404(Topic,id=selected_topic)
if topic.audience_id == 'nomcom' and not nomcom.group.has_role(request.user, ['chair','advisor','liaison','member']):
raise Http404()
if topic.audience_id == 'nominee' and not nomcom.nominee_set.filter(person=request.user.person).exists():
if topic.audience_id == 'nominees' and not nomcom.nominee_set.filter(person=request.user.person).exists():
raise Http404()
if public:
@ -468,8 +468,7 @@ def feedback(request, year, public):
if not nomcom.group.has_role(request.user, ['chair','advisor','liaison','member']):
topics = topics.exclude(audience_id='nomcom')
if not nomcom.nominee_set.filter(person=request.user.person).exists():
topics = topics.exclude(audience_id='nominee')
topics = topics.exclude(audience_id='nominees')
user_comments = Feedback.objects.filter(nomcom=nomcom,
type='comment',