Skip to content

Commit 92db803

Browse files
levkowetzlevkowetz
committed
Removed code that has been marked unreachable for more than 5 months.
 - Legacy-Id: 14472
1 parent 97206c6 commit 92db803

File tree

5 files changed

+166
-168
lines changed

5 files changed

+166
-168
lines changed

‎ietf/secr/drafts/forms.py‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django import forms
66

77
from ietf.doc.models import Document, DocAlias, State
8-
from ietf.name.models import IntendedStdLevelName, DocRelationshipName
8+
from ietf.name.models import IntendedStdLevelName
99
from ietf.group.models import Group
1010
from ietf.person.models import Person, Email
1111
from ietf.person.fields import SearchableEmailField
@@ -276,55 +276,55 @@ def __init__(self, *args, **kwargs):
276276
self.fields['title'].widget=forms.Textarea()
277277
self.fields['pages'].label='Number of Pages'
278278

279-
class RfcModelForm(forms.ModelForm):
280-
rfc_number = forms.IntegerField()
281-
rfc_published_date = forms.DateField(initial=datetime.datetime.now)
282-
group = GroupModelChoiceField(required=True)
283-
284-
class Meta:
285-
model = Document
286-
fields = ('title','group','pages','std_level','internal_comments')
287-
288-
# use this method to set attrs which keeps other meta info from model.
289-
def __init__(self, *args, **kwargs):
290-
super(RfcModelForm, self).__init__(*args, **kwargs)
291-
self.fields['title'].widget = forms.Textarea()
292-
self.fields['std_level'].required = True
293-
294-
def save(self, force_insert=False, force_update=False, commit=False):
295-
obj = super(RfcModelForm, self).save(commit=False)
296-
297-
# create DocAlias
298-
DocAlias.objects.create(document=self.instance,name="rfc%d" % self.cleaned_data['rfc_number'])
299-
300-
return obj
301-
302-
def clean_rfc_number(self):
303-
rfc_number = self.cleaned_data['rfc_number']
304-
if DocAlias.objects.filter(name='rfc' + str(rfc_number)):
305-
raise forms.ValidationError("RFC %d already exists" % rfc_number)
306-
return rfc_number
307-
308-
class RfcObsoletesForm(forms.Form):
309-
relation = forms.ModelChoiceField(queryset=DocRelationshipName.objects.filter(slug__in=('updates','obs')),required=False)
310-
rfc = forms.IntegerField(required=False)
311-
312-
# ensure that RFC exists
313-
def clean_rfc(self):
314-
rfc = self.cleaned_data.get('rfc','')
315-
if rfc:
316-
if not Document.objects.filter(docalias__name="rfc%s" % rfc):
317-
raise forms.ValidationError("RFC does not exist")
318-
return rfc
319-
320-
def clean(self):
321-
super(RfcObsoletesForm, self).clean()
322-
cleaned_data = self.cleaned_data
323-
relation = cleaned_data.get('relation','')
324-
rfc = cleaned_data.get('rfc','')
325-
if (relation and not rfc) or (rfc and not relation):
326-
raise forms.ValidationError('You must select a relation and enter RFC #')
327-
return cleaned_data
279+
# class RfcModelForm(forms.ModelForm):
280+
# rfc_number = forms.IntegerField()
281+
# rfc_published_date = forms.DateField(initial=datetime.datetime.now)
282+
# group = GroupModelChoiceField(required=True)
283+
#
284+
# class Meta:
285+
# model = Document
286+
# fields = ('title','group','pages','std_level','internal_comments')
287+
#
288+
# # use this method to set attrs which keeps other meta info from model.
289+
# def __init__(self, *args, **kwargs):
290+
# super(RfcModelForm, self).__init__(*args, **kwargs)
291+
# self.fields['title'].widget = forms.Textarea()
292+
# self.fields['std_level'].required = True
293+
#
294+
# def save(self, force_insert=False, force_update=False, commit=False):
295+
# obj = super(RfcModelForm, self).save(commit=False)
296+
#
297+
# # create DocAlias
298+
# DocAlias.objects.create(document=self.instance,name="rfc%d" % self.cleaned_data['rfc_number'])
299+
#
300+
# return obj
301+
#
302+
# def clean_rfc_number(self):
303+
# rfc_number = self.cleaned_data['rfc_number']
304+
# if DocAlias.objects.filter(name='rfc' + str(rfc_number)):
305+
# raise forms.ValidationError("RFC %d already exists" % rfc_number)
306+
# return rfc_number
307+
308+
# class RfcObsoletesForm(forms.Form):
309+
# relation = forms.ModelChoiceField(queryset=DocRelationshipName.objects.filter(slug__in=('updates','obs')),required=False)
310+
# rfc = forms.IntegerField(required=False)
311+
#
312+
# # ensure that RFC exists
313+
# def clean_rfc(self):
314+
# rfc = self.cleaned_data.get('rfc','')
315+
# if rfc:
316+
# if not Document.objects.filter(docalias__name="rfc%s" % rfc):
317+
# raise forms.ValidationError("RFC does not exist")
318+
# return rfc
319+
#
320+
# def clean(self):
321+
# super(RfcObsoletesForm, self).clean()
322+
# cleaned_data = self.cleaned_data
323+
# relation = cleaned_data.get('relation','')
324+
# rfc = cleaned_data.get('rfc','')
325+
# if (relation and not rfc) or (rfc and not relation):
326+
# raise forms.ValidationError('You must select a relation and enter RFC #')
327+
# return cleaned_data
328328

329329
class SearchForm(forms.Form):
330330
intended_std_level = forms.ModelChoiceField(queryset=IntendedStdLevelName.objects,label="Intended Status",required=False)

‎ietf/secr/drafts/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/edit/$', views.edit),
1919
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/extend/$', views.extend),
2020
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/email/$', views.email),
21-
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc),
21+
# url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc), # Not used any more
2222
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/replace/$', views.replace),
2323
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', views.revision),
2424
url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update),

‎ietf/secr/drafts/views.py‎

Lines changed: 80 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from django.conf import settings
88
from django.contrib import messages
99
from django.db.models import Max
10-
from django.forms.formsets import formset_factory
1110
from django.shortcuts import render, get_object_or_404, redirect
1211
from django.urls import reverse
1312
from django.utils.http import urlencode
@@ -21,8 +20,8 @@
2120
from ietf.person.models import Person
2221
from ietf.secr.drafts.email import announcement_from_form, get_email_initial
2322
from ietf.secr.drafts.forms import ( AddModelForm, AuthorForm, BaseRevisionModelForm, EditModelForm,
24-
EmailForm, ExtendForm, ReplaceForm, RevisionModelForm, RfcModelForm,
25-
RfcObsoletesForm, SearchForm, UploadForm, WithdrawForm )
23+
EmailForm, ExtendForm, ReplaceForm, RevisionModelForm,
24+
SearchForm, UploadForm, WithdrawForm )
2625
from ietf.secr.utils.ams_utils import get_base
2726
from ietf.secr.utils.document import get_rfc_num, get_start_date
2827
from ietf.submit.models import Submission, Preapproval, DraftSubmissionStateName, SubmissionEvent
@@ -804,84 +803,84 @@ def extend(request, id):
804803
'draft': draft},
805804
)
806805

807-
@role_required('Secretariat')
808-
def makerfc(request, id):
809-
'''
810-
Make RFC out of Internet Draft
811-
812-
**Templates:**
813-
814-
* ``drafts/makerfc.html``
815-
816-
**Template Variables:**
817-
818-
* draft
819-
'''
820-
from ietf.utils import log
821-
log.unreachable("2017-07-08")
822-
823-
draft = get_object_or_404(Document, name=id)
824-
825-
# raise error if draft intended standard is empty
826-
if not draft.intended_std_level:
827-
messages.error(request, 'ERROR: intended RFC status is not set')
828-
return redirect('ietf.secr.drafts.views.view', id=id)
829-
830-
ObsFormset = formset_factory(RfcObsoletesForm, extra=15, max_num=15)
831-
if request.method == 'POST':
832-
button_text = request.POST.get('submit', '')
833-
if button_text == 'Cancel':
834-
return redirect('ietf.secr.drafts.views.view', id=id)
835-
836-
form = RfcModelForm(request.POST, instance=draft)
837-
obs_formset = ObsFormset(request.POST, prefix='obs')
838-
if form.is_valid() and obs_formset.is_valid():
839-
840-
# TODO
841-
archive_draft_files(draft.name + '-' + draft.rev)
842-
843-
rfc = form.save(commit=False)
844-
845-
# create DocEvent
846-
e = DocEvent.objects.create(type='published_rfc',
847-
by=request.user.person,
848-
doc=rfc,
849-
rev=draft.rev,
850-
desc="Published RFC")
851-
852-
# change state
853-
draft.set_state(State.objects.get(type="draft", slug="rfc"))
854-
855-
# handle rfc_obsoletes formset
856-
# NOTE: because we are just adding RFCs in this form we don't need to worry
857-
# about the previous state of the obs forms
858-
for obs_form in obs_formset.forms:
859-
if obs_form.has_changed():
860-
rfc_acted_on = obs_form.cleaned_data.get('rfc','')
861-
target = DocAlias.objects.get(name="rfc%s" % rfc_acted_on)
862-
relation = obs_form.cleaned_data.get('relation','')
863-
if rfc and relation:
864-
# form validation ensures the rfc_acted_on exists, can safely use get
865-
RelatedDocument.objects.create(source=draft,
866-
target=target,
867-
relationship=DocRelationshipName.objects.get(slug=relation))
868-
869-
rfc.save_with_history([e])
870-
871-
messages.success(request, 'RFC created successfully!')
872-
return redirect('ietf.secr.drafts.views.view', id=id)
873-
else:
874-
# assert False, (form.errors, obs_formset.errors)
875-
pass
876-
else:
877-
form = RfcModelForm(instance=draft)
878-
obs_formset = ObsFormset(prefix='obs')
879-
880-
return render(request, 'drafts/makerfc.html', {
881-
'form': form,
882-
'obs_formset': obs_formset,
883-
'draft': draft},
884-
)
806+
# @role_required('Secretariat')
807+
# def makerfc(request, id):
808+
# '''
809+
# Make RFC out of Internet Draft
810+
#
811+
# **Templates:**
812+
#
813+
# * ``drafts/makerfc.html``
814+
#
815+
# **Template Variables:**
816+
#
817+
# * draft
818+
# '''
819+
# from ietf.utils import log
820+
# log.unreachable("2017-07-08")
821+
#
822+
# draft = get_object_or_404(Document, name=id)
823+
#
824+
# # raise error if draft intended standard is empty
825+
# if not draft.intended_std_level:
826+
# messages.error(request, 'ERROR: intended RFC status is not set')
827+
# return redirect('ietf.secr.drafts.views.view', id=id)
828+
#
829+
# ObsFormset = formset_factory(RfcObsoletesForm, extra=15, max_num=15)
830+
# if request.method == 'POST':
831+
# button_text = request.POST.get('submit', '')
832+
# if button_text == 'Cancel':
833+
# return redirect('ietf.secr.drafts.views.view', id=id)
834+
#
835+
# form = RfcModelForm(request.POST, instance=draft)
836+
# obs_formset = ObsFormset(request.POST, prefix='obs')
837+
# if form.is_valid() and obs_formset.is_valid():
838+
#
839+
# # TODO
840+
# archive_draft_files(draft.name + '-' + draft.rev)
841+
#
842+
# rfc = form.save(commit=False)
843+
#
844+
# # create DocEvent
845+
# e = DocEvent.objects.create(type='published_rfc',
846+
# by=request.user.person,
847+
# doc=rfc,
848+
# rev=draft.rev,
849+
# desc="Published RFC")
850+
#
851+
# # change state
852+
# draft.set_state(State.objects.get(type="draft", slug="rfc"))
853+
#
854+
# # handle rfc_obsoletes formset
855+
# # NOTE: because we are just adding RFCs in this form we don't need to worry
856+
# # about the previous state of the obs forms
857+
# for obs_form in obs_formset.forms:
858+
# if obs_form.has_changed():
859+
# rfc_acted_on = obs_form.cleaned_data.get('rfc','')
860+
# target = DocAlias.objects.get(name="rfc%s" % rfc_acted_on)
861+
# relation = obs_form.cleaned_data.get('relation','')
862+
# if rfc and relation:
863+
# # form validation ensures the rfc_acted_on exists, can safely use get
864+
# RelatedDocument.objects.create(source=draft,
865+
# target=target,
866+
# relationship=DocRelationshipName.objects.get(slug=relation))
867+
#
868+
# rfc.save_with_history([e])
869+
#
870+
# messages.success(request, 'RFC created successfully!')
871+
# return redirect('ietf.secr.drafts.views.view', id=id)
872+
# else:
873+
# # assert False, (form.errors, obs_formset.errors)
874+
# pass
875+
# else:
876+
# form = RfcModelForm(instance=draft)
877+
# obs_formset = ObsFormset(prefix='obs')
878+
#
879+
# return render(request, 'drafts/makerfc.html', {
880+
# 'form': form,
881+
# 'obs_formset': obs_formset,
882+
# 'draft': draft},
883+
# )
885884

886885
@role_required('Secretariat')
887886
def nudge_report(request):

‎ietf/secr/meetings/urls.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
urlpatterns = [
66
url(r'^$', views.main),
77
url(r'^add/$', views.add),
8-
url(r'^ajax/get-times/(?P<meeting_id>\d{1,6})/(?P<day>\d)/$', views.ajax_get_times),
8+
# url(r'^ajax/get-times/(?P<meeting_id>\d{1,6})/(?P<day>\d)/$', views.ajax_get_times), # Not in use
99
url(r'^blue_sheet/$', views.blue_sheet_redirect),
1010
url(r'^(?P<meeting_id>\d{1,6})/$', views.view),
1111
url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/$', views.blue_sheet),
@@ -21,7 +21,7 @@
2121
url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/$', views.times),
2222
url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/delete/(?P<time>[0-9\:]+)/$', views.times_delete),
2323
url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/edit/(?P<time>[0-9\:]+)/$', views.times_edit),
24-
url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/unschedule/(?P<session_id>\d{1,6})/$', views.unschedule),
24+
# url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/unschedule/(?P<session_id>\d{1,6})/$', views.unschedule), # Not in use
2525
url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/(?P<acronym>[-a-z0-9]+)/schedule/$', views.schedule),
2626
url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/(?P<session_id>\d{1,6})/edit/$', views.session_edit),
2727
url(r'^(?P<meeting_id>\d{1,6})/(?P<acronym>[-a-z0-9]+)/remove/$', views.remove_session),

0 commit comments

Comments
 (0)