From 92db803bacd793f36db8490e283bf6485a349f58 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 29 Dec 2017 19:48:18 +0000 Subject: [PATCH] Removed code that has been marked unreachable for more than 5 months. - Legacy-Id: 14472 --- ietf/secr/drafts/forms.py | 98 +++++++++++----------- ietf/secr/drafts/urls.py | 2 +- ietf/secr/drafts/views.py | 161 ++++++++++++++++++------------------ ietf/secr/meetings/urls.py | 4 +- ietf/secr/meetings/views.py | 65 +++++++-------- 5 files changed, 164 insertions(+), 166 deletions(-) diff --git a/ietf/secr/drafts/forms.py b/ietf/secr/drafts/forms.py index 846cb1f0a..620f9bbbb 100644 --- a/ietf/secr/drafts/forms.py +++ b/ietf/secr/drafts/forms.py @@ -5,7 +5,7 @@ import os from django import forms from ietf.doc.models import Document, DocAlias, State -from ietf.name.models import IntendedStdLevelName, DocRelationshipName +from ietf.name.models import IntendedStdLevelName from ietf.group.models import Group from ietf.person.models import Person, Email from ietf.person.fields import SearchableEmailField @@ -276,55 +276,55 @@ class RevisionModelForm(forms.ModelForm): self.fields['title'].widget=forms.Textarea() self.fields['pages'].label='Number of Pages' -class RfcModelForm(forms.ModelForm): - rfc_number = forms.IntegerField() - rfc_published_date = forms.DateField(initial=datetime.datetime.now) - group = GroupModelChoiceField(required=True) +# class RfcModelForm(forms.ModelForm): +# rfc_number = forms.IntegerField() +# rfc_published_date = forms.DateField(initial=datetime.datetime.now) +# group = GroupModelChoiceField(required=True) +# +# class Meta: +# model = Document +# fields = ('title','group','pages','std_level','internal_comments') +# +# # use this method to set attrs which keeps other meta info from model. +# def __init__(self, *args, **kwargs): +# super(RfcModelForm, self).__init__(*args, **kwargs) +# self.fields['title'].widget = forms.Textarea() +# self.fields['std_level'].required = True +# +# def save(self, force_insert=False, force_update=False, commit=False): +# obj = super(RfcModelForm, self).save(commit=False) +# +# # create DocAlias +# DocAlias.objects.create(document=self.instance,name="rfc%d" % self.cleaned_data['rfc_number']) +# +# return obj +# +# def clean_rfc_number(self): +# rfc_number = self.cleaned_data['rfc_number'] +# if DocAlias.objects.filter(name='rfc' + str(rfc_number)): +# raise forms.ValidationError("RFC %d already exists" % rfc_number) +# return rfc_number - class Meta: - model = Document - fields = ('title','group','pages','std_level','internal_comments') - - # use this method to set attrs which keeps other meta info from model. - def __init__(self, *args, **kwargs): - super(RfcModelForm, self).__init__(*args, **kwargs) - self.fields['title'].widget = forms.Textarea() - self.fields['std_level'].required = True - - def save(self, force_insert=False, force_update=False, commit=False): - obj = super(RfcModelForm, self).save(commit=False) - - # create DocAlias - DocAlias.objects.create(document=self.instance,name="rfc%d" % self.cleaned_data['rfc_number']) - - return obj - - def clean_rfc_number(self): - rfc_number = self.cleaned_data['rfc_number'] - if DocAlias.objects.filter(name='rfc' + str(rfc_number)): - raise forms.ValidationError("RFC %d already exists" % rfc_number) - return rfc_number - -class RfcObsoletesForm(forms.Form): - relation = forms.ModelChoiceField(queryset=DocRelationshipName.objects.filter(slug__in=('updates','obs')),required=False) - rfc = forms.IntegerField(required=False) - - # ensure that RFC exists - def clean_rfc(self): - rfc = self.cleaned_data.get('rfc','') - if rfc: - if not Document.objects.filter(docalias__name="rfc%s" % rfc): - raise forms.ValidationError("RFC does not exist") - return rfc - - def clean(self): - super(RfcObsoletesForm, self).clean() - cleaned_data = self.cleaned_data - relation = cleaned_data.get('relation','') - rfc = cleaned_data.get('rfc','') - if (relation and not rfc) or (rfc and not relation): - raise forms.ValidationError('You must select a relation and enter RFC #') - return cleaned_data +# class RfcObsoletesForm(forms.Form): +# relation = forms.ModelChoiceField(queryset=DocRelationshipName.objects.filter(slug__in=('updates','obs')),required=False) +# rfc = forms.IntegerField(required=False) +# +# # ensure that RFC exists +# def clean_rfc(self): +# rfc = self.cleaned_data.get('rfc','') +# if rfc: +# if not Document.objects.filter(docalias__name="rfc%s" % rfc): +# raise forms.ValidationError("RFC does not exist") +# return rfc +# +# def clean(self): +# super(RfcObsoletesForm, self).clean() +# cleaned_data = self.cleaned_data +# relation = cleaned_data.get('relation','') +# rfc = cleaned_data.get('rfc','') +# if (relation and not rfc) or (rfc and not relation): +# raise forms.ValidationError('You must select a relation and enter RFC #') +# return cleaned_data class SearchForm(forms.Form): intended_std_level = forms.ModelChoiceField(queryset=IntendedStdLevelName.objects,label="Intended Status",required=False) diff --git a/ietf/secr/drafts/urls.py b/ietf/secr/drafts/urls.py index c76a863ab..ed80b72c5 100644 --- a/ietf/secr/drafts/urls.py +++ b/ietf/secr/drafts/urls.py @@ -18,7 +18,7 @@ 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), + # url(r'^(?P[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc), # Not used any more url(r'^(?P[A-Za-z0-9._\-\+]+)/replace/$', views.replace), url(r'^(?P[A-Za-z0-9._\-\+]+)/revision/$', views.revision), url(r'^(?P[A-Za-z0-9._\-\+]+)/update/$', views.update), diff --git a/ietf/secr/drafts/views.py b/ietf/secr/drafts/views.py index 73309d0be..0a2d02692 100644 --- a/ietf/secr/drafts/views.py +++ b/ietf/secr/drafts/views.py @@ -7,7 +7,6 @@ from dateutil.parser import parse from django.conf import settings from django.contrib import messages from django.db.models import Max -from django.forms.formsets import formset_factory from django.shortcuts import render, get_object_or_404, redirect from django.urls import reverse from django.utils.http import urlencode @@ -21,8 +20,8 @@ from ietf.name.models import StreamName from ietf.person.models import Person from ietf.secr.drafts.email import announcement_from_form, get_email_initial from ietf.secr.drafts.forms import ( AddModelForm, AuthorForm, BaseRevisionModelForm, EditModelForm, - EmailForm, ExtendForm, ReplaceForm, RevisionModelForm, RfcModelForm, - RfcObsoletesForm, SearchForm, UploadForm, WithdrawForm ) + EmailForm, ExtendForm, ReplaceForm, RevisionModelForm, + SearchForm, UploadForm, WithdrawForm ) from ietf.secr.utils.ams_utils import get_base from ietf.secr.utils.document import get_rfc_num, get_start_date from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName, SubmissionEvent @@ -804,84 +803,84 @@ 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 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/meetings/urls.py b/ietf/secr/meetings/urls.py index 0b8b1446d..8bd355f10 100644 --- a/ietf/secr/meetings/urls.py +++ b/ietf/secr/meetings/urls.py @@ -5,7 +5,7 @@ from ietf.utils.urls import url urlpatterns = [ url(r'^$', views.main), url(r'^add/$', views.add), - url(r'^ajax/get-times/(?P\d{1,6})/(?P\d)/$', views.ajax_get_times), + # url(r'^ajax/get-times/(?P\d{1,6})/(?P\d)/$', views.ajax_get_times), # Not in use url(r'^blue_sheet/$', views.blue_sheet_redirect), url(r'^(?P\d{1,6})/$', views.view), url(r'^(?P\d{1,6})/blue_sheet/$', views.blue_sheet), @@ -21,7 +21,7 @@ urlpatterns = [ url(r'^(?P\d{1,6})/(?P[A-Za-z0-9_\-]+)/times/$', views.times), url(r'^(?P\d{1,6})/(?P[A-Za-z0-9_\-]+)/times/delete/(?P