Removed the already disabled "Make RFC" functionality from /secr/drafts. Fixes #2513. Commit ready for merge.
- Legacy-Id: 15113
This commit is contained in:
parent
82681b28dd
commit
7d2ac8306e
|
@ -17,7 +17,6 @@ urlpatterns = [
|
||||||
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/edit/$', views.edit),
|
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/edit/$', views.edit),
|
||||||
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/extend/$', views.extend),
|
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/extend/$', views.extend),
|
||||||
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/email/$', views.email),
|
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/email/$', views.email),
|
||||||
# url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc), # Not used any more
|
|
||||||
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', views.revision),
|
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', views.revision),
|
||||||
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update),
|
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update),
|
||||||
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/withdraw/$', views.withdraw),
|
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/withdraw/$', views.withdraw),
|
||||||
|
|
|
@ -746,85 +746,6 @@ def extend(request, id):
|
||||||
'draft': draft},
|
'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')
|
@role_required('Secretariat')
|
||||||
def nudge_report(request):
|
def nudge_report(request):
|
||||||
'''
|
'''
|
||||||
|
|
|
@ -85,7 +85,6 @@
|
||||||
<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>
|
<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>
|
||||||
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='extend/'">Extend Expiry</button></li>
|
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='extend/'">Extend Expiry</button></li>
|
||||||
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='withdraw/'">Withdraw</button></li>
|
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='withdraw/'">Withdraw</button></li>
|
||||||
<li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='makerfc/'">Make RFC</button></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div> <!-- inline-related -->
|
</div> <!-- inline-related -->
|
||||||
</div> <!-- draft-view-col2 -->
|
</div> <!-- draft-view-col2 -->
|
||||||
|
|
Loading…
Reference in a new issue