Skip to content

Commit 7d2ac83

Browse files
committed
Removed the already disabled "Make RFC" functionality from /secr/drafts. Fixes ietf-tools#2513. Commit ready for merge.
- Legacy-Id: 15113
1 parent 82681b2 commit 7d2ac83

3 files changed

Lines changed: 0 additions & 81 deletions

File tree

ietf/secr/drafts/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/edit/$', views.edit),
1818
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/extend/$', views.extend),
1919
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/email/$', views.email),
20-
# url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc), # Not used any more
2120
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', views.revision),
2221
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update),
2322
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/withdraw/$', views.withdraw),

ietf/secr/drafts/views.py

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -746,85 +746,6 @@ def extend(request, id):
746746
'draft': draft},
747747
)
748748

749-
# @role_required('Secretariat')
750-
# def makerfc(request, id):
751-
# '''
752-
# Make RFC out of Internet Draft
753-
#
754-
# **Templates:**
755-
#
756-
# * ``drafts/makerfc.html``
757-
#
758-
# **Template Variables:**
759-
#
760-
# * draft
761-
# '''
762-
# from ietf.utils import log
763-
# log.unreachable("2017-07-08")
764-
#
765-
# draft = get_object_or_404(Document, name=id)
766-
#
767-
# # raise error if draft intended standard is empty
768-
# if not draft.intended_std_level:
769-
# messages.error(request, 'ERROR: intended RFC status is not set')
770-
# return redirect('ietf.secr.drafts.views.view', id=id)
771-
#
772-
# ObsFormset = formset_factory(RfcObsoletesForm, extra=15, max_num=15)
773-
# if request.method == 'POST':
774-
# button_text = request.POST.get('submit', '')
775-
# if button_text == 'Cancel':
776-
# return redirect('ietf.secr.drafts.views.view', id=id)
777-
#
778-
# form = RfcModelForm(request.POST, instance=draft)
779-
# obs_formset = ObsFormset(request.POST, prefix='obs')
780-
# if form.is_valid() and obs_formset.is_valid():
781-
#
782-
# # TODO
783-
# archive_draft_files(draft.name + '-' + draft.rev)
784-
#
785-
# rfc = form.save(commit=False)
786-
#
787-
# # create DocEvent
788-
# e = DocEvent.objects.create(type='published_rfc',
789-
# by=request.user.person,
790-
# doc=rfc,
791-
# rev=draft.rev,
792-
# desc="Published RFC")
793-
#
794-
# # change state
795-
# draft.set_state(State.objects.get(type="draft", slug="rfc"))
796-
#
797-
# # handle rfc_obsoletes formset
798-
# # NOTE: because we are just adding RFCs in this form we don't need to worry
799-
# # about the previous state of the obs forms
800-
# for obs_form in obs_formset.forms:
801-
# if obs_form.has_changed():
802-
# rfc_acted_on = obs_form.cleaned_data.get('rfc','')
803-
# target = DocAlias.objects.get(name="rfc%s" % rfc_acted_on)
804-
# relation = obs_form.cleaned_data.get('relation','')
805-
# if rfc and relation:
806-
# # form validation ensures the rfc_acted_on exists, can safely use get
807-
# RelatedDocument.objects.create(source=draft,
808-
# target=target,
809-
# relationship=DocRelationshipName.objects.get(slug=relation))
810-
#
811-
# rfc.save_with_history([e])
812-
#
813-
# messages.success(request, 'RFC created successfully!')
814-
# return redirect('ietf.secr.drafts.views.view', id=id)
815-
# else:
816-
# # assert False, (form.errors, obs_formset.errors)
817-
# pass
818-
# else:
819-
# form = RfcModelForm(instance=draft)
820-
# obs_formset = ObsFormset(prefix='obs')
821-
#
822-
# return render(request, 'drafts/makerfc.html', {
823-
# 'form': form,
824-
# 'obs_formset': obs_formset,
825-
# 'draft': draft},
826-
# )
827-
828749
@role_required('Secretariat')
829750
def nudge_report(request):
830751
'''

ietf/secr/templates/drafts/view.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ <h2>Actions</h2>
8585
<li><button {% if is_expired or is_withdrawn %}{% else %}disabled="disabled"{% endif %}onclick="window.location='{% url "ietf.secr.drafts.views.email" id=draft.name %}?action=resurrect'">Resurrect</button></li>
8686
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='extend/'">Extend Expiry</button></li>
8787
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='withdraw/'">Withdraw</button></li>
88-
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='makerfc/'">Make RFC</button></li>
8988
</ul>
9089
</div> <!-- inline-related -->
9190
</div> <!-- draft-view-col2 -->

0 commit comments

Comments
 (0)