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

Avoid confusing messages saying a key has not been entered when it has. Fixes #2250. Commit ready for merge.

Browse source 
- Legacy-Id: 13390
This commit is contained in:
Robert Sparks 2017-05-17 21:02:20 +00:00
parent 4b0fefeb3e
commit 1a18130c57
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/nomcom/tests.py
View file

@ -1741,8 +1741,6 @@ class NoPublicKeyTests(TestCase):
self.do_common_work(reverse('ietf.nomcom.views.private_feedback_email',kwargs={'year':self.nc.year()}),False) self.do_common_work(reverse('ietf.nomcom.views.private_feedback_email',kwargs={'year':self.nc.year()}),False)
# No questionnaire responses # No questionnaire responses
self.do_common_work(reverse('ietf.nomcom.views.private_questionnaire',kwargs={'year':self.nc.year()}),False) self.do_common_work(reverse('ietf.nomcom.views.private_questionnaire',kwargs={'year':self.nc.year()}),False)
# Warn on edit nomcom
self.do_common_work(reverse('ietf.nomcom.views.edit_nomcom',kwargs={'year':self.nc.year()}),True)
class MergePersonTests(TestCase): class MergePersonTests(TestCase):
def setUp(self): def setUp(self):

16
ietf/nomcom/views.py
View file

@ -108,11 +108,6 @@ def announcements(request):
def private_key(request, year): def private_key(request, year):
nomcom = get_nomcom_by_year(year) nomcom = get_nomcom_by_year(year)
if request.session.get('NOMCOM_PRIVATE_KEY_%s' % year, None):
messages.warning(request, 'You already have a private decryption key set for this session.')
else:
messages.warning(request, "You don't have a private decryption key set for this session yet")
back_url = request.GET.get('back_to', reverse('ietf.nomcom.views.private_index', None, args=(year, ))) back_url = request.GET.get('back_to', reverse('ietf.nomcom.views.private_index', None, args=(year, )))
if request.method == 'POST': if request.method == 'POST':
form = PrivateKeyForm(data=request.POST) form = PrivateKeyForm(data=request.POST)
@ -121,6 +116,12 @@ def private_key(request, year):
return HttpResponseRedirect(back_url) return HttpResponseRedirect(back_url)
else: else:
form = PrivateKeyForm() form = PrivateKeyForm()
if request.session.get('NOMCOM_PRIVATE_KEY_%s' % year, None):
messages.warning(request, 'You already have a private decryption key set for this session.')
else:
messages.warning(request, "You don't have a private decryption key set for this session yet")
return render(request, 'nomcom/private_key.html', return render(request, 'nomcom/private_key.html',
{'nomcom': nomcom, {'nomcom': nomcom,
'year': year, 'year': year,
@ -832,11 +833,6 @@ def edit_nominee(request, year, nominee_id):
def edit_nomcom(request, year): def edit_nomcom(request, year):
nomcom = get_nomcom_by_year(year) nomcom = get_nomcom_by_year(year)
if nomcom.public_key:
messages.warning(request, 'Previous data will remain encrypted with the old key')
else:
messages.warning(request, 'This Nomcom does not yet have a public key')
ReminderDateInlineFormSet = inlineformset_factory(parent_model=NomCom, ReminderDateInlineFormSet = inlineformset_factory(parent_model=NomCom,
model=ReminderDates, model=ReminderDates,
form=ReminderDatesForm) form=ReminderDatesForm)