From 7d2ac8306e8cce0c90bf7f8ad3a809340ce404a8 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 3 May 2018 17:35:38 +0000 Subject: [PATCH] Removed the already disabled "Make RFC" functionality from /secr/drafts. Fixes #2513. Commit ready for merge. - Legacy-Id: 15113 --- ietf/secr/drafts/urls.py | 1 - ietf/secr/drafts/views.py | 79 ---------------------------- ietf/secr/templates/drafts/view.html | 1 - 3 files changed, 81 deletions(-) diff --git a/ietf/secr/drafts/urls.py b/ietf/secr/drafts/urls.py index 327de1e51..4364667ba 100644 --- a/ietf/secr/drafts/urls.py +++ b/ietf/secr/drafts/urls.py @@ -17,7 +17,6 @@ urlpatterns = [ url(r'^(?P[A-Za-z0-9._\-\+]+)/edit/$', views.edit), url(r'^(?P[A-Za-z0-9._\-\+]+)/extend/$', views.extend), url(r'^(?P[A-Za-z0-9._\-\+]+)/email/$', views.email), - # url(r'^(?P[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc), # Not used any more url(r'^(?P[A-Za-z0-9._\-\+]+)/revision/$', views.revision), url(r'^(?P[A-Za-z0-9._\-\+]+)/update/$', views.update), url(r'^(?P[A-Za-z0-9._\-\+]+)/withdraw/$', views.withdraw), diff --git a/ietf/secr/drafts/views.py b/ietf/secr/drafts/views.py index 6c7782846..84184874e 100644 --- a/ietf/secr/drafts/views.py +++ b/ietf/secr/drafts/views.py @@ -746,85 +746,6 @@ def extend(request, id): 'draft': draft}, ) -# @role_required('Secretariat') -# def makerfc(request, id): -# ''' -# Make RFC out of Internet Draft -# -# **Templates:** -# -# * ``drafts/makerfc.html`` -# -# **Template Variables:** -# -# * draft -# ''' -# from ietf.utils import log -# log.unreachable("2017-07-08") -# -# draft = get_object_or_404(Document, name=id) -# -# # raise error if draft intended standard is empty -# if not draft.intended_std_level: -# messages.error(request, 'ERROR: intended RFC status is not set') -# return redirect('ietf.secr.drafts.views.view', id=id) -# -# ObsFormset = formset_factory(RfcObsoletesForm, extra=15, max_num=15) -# if request.method == 'POST': -# button_text = request.POST.get('submit', '') -# if button_text == 'Cancel': -# return redirect('ietf.secr.drafts.views.view', id=id) -# -# form = RfcModelForm(request.POST, instance=draft) -# obs_formset = ObsFormset(request.POST, prefix='obs') -# if form.is_valid() and obs_formset.is_valid(): -# -# # TODO -# archive_draft_files(draft.name + '-' + draft.rev) -# -# rfc = form.save(commit=False) -# -# # create DocEvent -# e = DocEvent.objects.create(type='published_rfc', -# by=request.user.person, -# doc=rfc, -# rev=draft.rev, -# desc="Published RFC") -# -# # change state -# draft.set_state(State.objects.get(type="draft", slug="rfc")) -# -# # handle rfc_obsoletes formset -# # NOTE: because we are just adding RFCs in this form we don't need to worry -# # about the previous state of the obs forms -# for obs_form in obs_formset.forms: -# if obs_form.has_changed(): -# rfc_acted_on = obs_form.cleaned_data.get('rfc','') -# target = DocAlias.objects.get(name="rfc%s" % rfc_acted_on) -# relation = obs_form.cleaned_data.get('relation','') -# if rfc and relation: -# # form validation ensures the rfc_acted_on exists, can safely use get -# RelatedDocument.objects.create(source=draft, -# target=target, -# relationship=DocRelationshipName.objects.get(slug=relation)) -# -# rfc.save_with_history([e]) -# -# messages.success(request, 'RFC created successfully!') -# return redirect('ietf.secr.drafts.views.view', id=id) -# else: -# # assert False, (form.errors, obs_formset.errors) -# pass -# else: -# form = RfcModelForm(instance=draft) -# obs_formset = ObsFormset(prefix='obs') -# -# return render(request, 'drafts/makerfc.html', { -# 'form': form, -# 'obs_formset': obs_formset, -# 'draft': draft}, -# ) - @role_required('Secretariat') def nudge_report(request): ''' diff --git a/ietf/secr/templates/drafts/view.html b/ietf/secr/templates/drafts/view.html index 4d0ca2faf..4a3782b51 100644 --- a/ietf/secr/templates/drafts/view.html +++ b/ietf/secr/templates/drafts/view.html @@ -85,7 +85,6 @@
  • -