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

Merged [6859] from rcross@amsl.com:

Browse source 
fixed calls to reverse() to match new url names since code merge
 - Legacy-Id: 6954
Note: SVN reference [6859] has been migrated to Git commit 9b06fb9958
This commit is contained in:
Henrik Levkowetz 2013-12-16 22:33:54 +00:00
parent 9ef4b5779e 9b06fb9958
commit db5153b6e8
2 changed files with 36 additions and 7 deletions
changelog
ietf/secr/ipradmin
views.py

29
changelog
View file

@ -1,3 +1,32 @@
ietfdb (4.84) ietf; urgency=low
This is a minor bugfix release, in preparation for merging in the latest
shim-removal work.
* Merged [6859] from rcross@amsl.com:
Fixed calls to reverse() to match new url names since code merge
* Merged [6858] from rcross@amsl.com:
Use correct URL in new IPR notification email
* Merged [6857] from rjsparks@nostrum.com:
A script to run from cron to send daily messages to IETF Announce showing
the email header field change. his should be run from Jan 6 to Jan 20,
after which point we need to deploy analagous changes to the code that
constructs last call announcements. This is related to bug #811.
* Merged [6701] from rjsparks@nostrum.com:
Adds pages to show what a given document refers to and what refers to it.
ixes bug #1194 ommit ready for merge
* Merged [6672] from rjsparks@nostrum.com:
Removed requirement to enter a phone number in various places on an IPR
disclosure entry form. Fixes bug #1176
* Fixed a typo. Fixes issue #1216.
-- Henrik Levkowetz <henrik@levkowetz.com> 16 Dec 2013 23:28:56 +0100
ietfdb (4.83) ietf; urgency=high
This release provides the code from the IETF-88 code sprint, and also

14
ietf/secr/ipradmin/views.py
View file

@ -120,7 +120,7 @@ def admin_notify(request, ipr_id):
else:
request.session['send_result'] = 'Messages sent successfully'
return HttpResponseRedirect(reverse(
'ipr_old_submitter_notify',
'ipradmin_old_submitter_notify',
args=[ipr_id]
))
@ -351,7 +351,7 @@ def admin_delete(request, ipr_id):
ipr_dtl = IprDetail.objects.get(ipr_id=ipr_id)
ipr_dtl.status = 2
ipr_dtl.save()
return HttpResponseRedirect(reverse('ipr_admin_list'))
return HttpResponseRedirect(reverse('ipradmin_admin_list'))
@template('ipradmin/notify.html')
def old_submitter_notify(request, ipr_id):
@ -364,7 +364,7 @@ def old_submitter_notify(request, ipr_id):
else:
request.session['send_result'] = 'Messages sent successfully'
return HttpResponseRedirect(reverse(
'ipr_old_submitter_notify',
'ipradmin_old_submitter_notify',
args=[ipr_id]
))
@ -425,9 +425,9 @@ def admin_detail(request, ipr_id):
if command == 'post':
return admin_post(request, ipr_id, 'detail', 'post')
elif command == 'notify':
return HttpResponseRedirect(reverse('ipr_old_submitter_notify', args=[ipr_id]))
return HttpResponseRedirect(reverse('ipradmin_old_submitter_notify', args=[ipr_id]))
elif command == 'delete':
return HttpResponseRedirect(reverse('ipr_admin_delete', args=[ipr_id]))
return HttpResponseRedirect(reverse('ipradmin_admin_delete', args=[ipr_id]))
header_text = possible = temp_name = footer_text = ''
contact_one_data, contact_two_data, document_data, licensing_data,\
@ -691,7 +691,7 @@ def admin_create(request):
ipr_contact_formset.forms[1].save(ipr_detail)
if ipr_contact_formset.forms[2].is_valid():
ipr_contact_formset.forms[2].save(ipr_detail)
return HttpResponseRedirect(reverse('ipr_admin_list'))
return HttpResponseRedirect(reverse('ipradmin_admin_list'))
else:
ipr_detail_form = IprDetailForm(formtype='create')
ipr_contact_formset = IPRContactFormset(initial=[
@ -724,7 +724,7 @@ def admin_update(request, ipr_id):
else:
redirect_url = ''
else: # remove
redirect_url = reverse('ipr_admin_list')
redirect_url = reverse('ipradmin_admin_list')
if 'admin_remove_ipr' in request.POST:
ipr_detail.status = 2
elif 'request_remove_ipr' in request.POST: