Skip to content

Commit c676613

Browse files
rjsparksrjsparks
committed
Improved validaiton of status change document name
added the ability to start a status change when looking at an RFC (populating the start from accordingly) Made changes and proposed changes show on the RFC pages - Legacy-Id: 5330
1 parent 589ff69 commit c676613

10 files changed

Lines changed: 109 additions & 44 deletions

File tree

‎ietf/doc/views_status_change.py‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,22 +438,45 @@ class StartStatusChangeForm(forms.Form):
438438

439439
def __init__(self, *args, **kwargs):
440440
super(self.__class__, self).__init__(*args, **kwargs)
441+
self.relations = self.initial.get('relations')
441442

442443
# telechat choices
443444
dates = [d.date for d in TelechatDate.objects.active().order_by('date')]
444445
self.fields['telechat_date'].choices = [("", "(not on agenda)")] + [(d, d.strftime("%Y-%m-%d")) for d in dates]
445446

446447
def clean_document_name(self):
447448
name = self.cleaned_data['document_name']
449+
errors=[]
450+
if re.search("[^a-z0-9-]", name):
451+
errors.append("The name of the document may only contain digits, lowercase letters and dashes")
452+
if re.search("--", name):
453+
errors.append("Please do not put more than one hyphen between any two words in the name")
454+
if name.startswith('status-change'):
455+
errors.append("status-change- will be added automatically as a prefix")
456+
if name.startswith('-'):
457+
errors.append("status-change- will be added automatically as a prefix, starting with a - will result in status-change-%s"%name)
458+
if re.search("-[0-9]{2}$", name):
459+
errors.append("This name looks like ends in a version number. -00 will be added automatically. Please adjust the end of the name.")
448460
if Document.objects.filter(name='status-change-%s'%name):
449-
raise forms.ValidationError("status-change-%s already exists"%name)
461+
errors.append("status-change-%s already exists"%name)
462+
if name.endswith('CHANGETHIS'):
463+
errors.append("Please change CHANGETHIS to reflect the intent of this status change")
464+
if errors:
465+
raise forms.ValidationError(errors)
450466
return name
451467

468+
def clean_title(self):
469+
title = self.cleaned_data['title']
470+
errors=[]
471+
if title.endswith('CHANGETHIS'):
472+
errors.append("Please change CHANGETHIS to reflect the intent of this status change")
473+
if errors:
474+
raise forms.ValidationError(errors)
475+
return title
476+
452477
def clean(self):
453478
return clean_helper(self,StartStatusChangeForm)
454479

455-
#TODO - cleaned data, especially on document_name
456-
457480
def rfc_status_changes(request):
458481
"""Show the rfc status changes that are under consideration, and those that are completed."""
459482

@@ -466,9 +489,14 @@ def rfc_status_changes(request):
466489
context_instance = RequestContext(request))
467490

468491
@role_required("Area Director","Secretariat")
469-
def start_rfc_status_change(request):
492+
def start_rfc_status_change(request,name):
470493
"""Start the RFC status change review process, setting the initial shepherding AD, and possibly putting the review on a telechat."""
471494

495+
if name:
496+
if not re.match("(?i)rfc[0-9]{4}",name):
497+
raise Http404
498+
seed_rfc = get_object_or_404(Document, type="draft", docalias__name=name)
499+
472500
login = request.user.get_profile()
473501

474502
relation_slugs = DocRelationshipName.objects.filter(slug__in=RELATION_SLUGS)
@@ -505,8 +533,13 @@ def start_rfc_status_change(request):
505533

506534
return HttpResponseRedirect(status_change.get_absolute_url())
507535
else:
508-
init = {
509-
}
536+
init = {}
537+
if name:
538+
init['title'] = "%s to CHANGETHIS" % seed_rfc.title
539+
init['document_name'] = "%s-to-CHANGETHIS" % seed_rfc.canonical_name()
540+
relations={}
541+
relations[seed_rfc.canonical_name()]=None
542+
init['relations'] = relations
510543
form = StartStatusChangeForm(initial=init)
511544

512545
return render_to_response('doc/status_change/start.html',

‎ietf/idrfc/idrfc_wrapper.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,11 @@ def to_json(self):
405405
result['ietf_process'] = self.ietf_process.dict()
406406
return json.dumps(result, indent=2)
407407

408+
def underlying_document(self):
409+
""" Expose the Document object underneath the proxy """
410+
from ietf.doc.models import Document
411+
return Document.objects.get(docalias__name='rfc%04d'%self.rfc_number)
412+
408413
# ---------------------------------------------------------------------------
409414

410415
class IetfProcessData:

‎ietf/idrfc/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
(r'^active/$', views_search.active),
4343
(r'^in-last-call/$', views_search.in_last_call),
4444
url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'),
45-
url(r'^start-rfc-status-change/$', views_status_change.start_rfc_status_change, name='start_rfc_status_change'),
45+
url(r'^start-rfc-status-change/(?P<name>[A-Za-z0-9._+-]*)$', views_status_change.start_rfc_status_change, name='start_rfc_status_change'),
4646
url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.by_ad, name="doc_search_by_ad"),
4747

4848
url(r'^(?P<name>[A-Za-z0-9._+-]+)/((?P<rev>[0-9-]+)/)?$', views_doc.document_main, name="doc_view"),

‎ietf/idrfc/views_doc.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
from ietf.doc.utils import *
5555
from ietf.utils.history import find_history_active_at
5656
from ietf.ietfauth.decorators import has_role
57+
from ietf.doc.views_status_change import RELATION_SLUGS as status_change_relationships
5758

5859
def render_document_top(request, doc, tab, name):
5960
tabs = []
@@ -236,7 +237,7 @@ def document_history(request, name):
236237
diff_revisions = []
237238
seen = set()
238239

239-
diffable = name.startswith("draft") or name.startswith("charter") or name.startswith("conflict-review")
240+
diffable = name.startswith("draft") or name.startswith("charter") or name.startswith("conflict-review") or name.startswith("status-change")
240241

241242
if diffable:
242243
for e in NewRevisionDocEvent.objects.filter(type="new_revision", doc__in=diff_documents).select_related('doc').order_by("-time", "-id"):
@@ -250,6 +251,9 @@ def document_history(request, name):
250251
elif name.startswith("conflict-review"):
251252
h = find_history_active_at(e.doc, e.time)
252253
url = settings.CONFLICT_REVIEW_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), e.rev))
254+
elif name.startswith("status-change"):
255+
h = find_history_active_at(e.doc, e.time)
256+
url = settings.STATUS_CHANGE_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), e.rev))
253257
elif name.startswith("draft"):
254258
# rfcdiff tool has special support for IDs
255259
url = e.doc.name + "-" + e.rev
@@ -450,6 +454,14 @@ def document_main_rfc(request, rfc_number, tab):
450454
content1 = ""
451455
content2 = ""
452456

457+
info['status_changes'] = ', '.join([ rel.source.canonical_name() for rel in RelatedDocument.objects.filter(relationship__in=status_change_relationships,target__document=doc.underlying_document()) if rel.source.get_state_slug() in ('appr-sent','appr-pend')])
458+
info['proposed_status_changes'] = ', '.join([ rel.source.canonical_name() for rel in RelatedDocument.objects.filter(relationship__in=status_change_relationships,target__document=doc.underlying_document()) if rel.source.get_state_slug() in ('needshep','adrev','iesgeval','defer','appr-pr')])
459+
460+
print "DEBUGGING"
461+
print doc.underlying_document()
462+
print "status_changes",info['status_changes']
463+
print "proposed_status_changes",info['proposed_status_changes']
464+
453465
history = _get_history(doc, None)
454466

455467
template = "idrfc/doc_tab_%s" % tab

‎ietf/idtracker/templatetags/ietf_filters.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ def urlize_ietf_docs(string, autoescape=None):
226226
string = re.sub("(?<!>)(FYI ?)0{0,3}(\d+)", "<a href=\"http://tools.ietf.org/html/fyi\\2/\">\\1\\2</a>", string)
227227
string = re.sub("(?<!>)(draft-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
228228
string = re.sub("(?<!>)(conflict-review-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
229+
string = re.sub("(?<!>)(status-change-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
229230
return mark_safe(string)
230231
urlize_ietf_docs.is_safe = True
231232
urlize_ietf_docs.needs_autoescape = True

‎ietf/iesg/views.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,14 @@ def get_doc_sectionREDESIGN(doc):
166166
s = "332"
167167
else:
168168
s = "331"
169+
elif doc.type_id == 'statchg':
170+
# TODO This is WRONG
171+
s="211"
172+
#protocol_action = False
173+
#for relation in doc.relateddocument_set.filter(relationship__in="('tops','tois','tohist','toinf','tobcp,'toexp')"):
174+
# if relation.relationship.slug in ('tops','tois') or relation.target.document.std_level.slug in ('std','ds','ps'):
175+
# protocol_action = True
176+
#if protocol_action:
169177

170178
return s
171179

‎ietf/templates/doc/status_change/start.html‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
form.start-rfc-status-change-review #id_notify {
77
width: 600px;
88
}
9+
form.start-rfc-status-change-review #id_title {
10+
width: 600px;
11+
}
912
form.start-rfc-status-change-review #id_document_name {
1013
width: 510px;
1114
}
@@ -29,18 +32,6 @@ <h1>Begin RFC status change review</h1>
2932

3033
<form class="start-rfc-status-change-review" action="" method="post">
3134
<table>
32-
{% for field in form.visible_fields %}
33-
<tr>
34-
<th>{{ field.label_tag }}:</th>
35-
<td>
36-
{% if field.label == "Document name" %}status-change-{% endif %}
37-
{{ field }}
38-
{% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
39-
40-
{{ field.errors }}
41-
</td>
42-
</tr>
43-
{% if field.label == "Document name" %}
4435
<tr>
4536
<th>Affects RFCs:</th>
4637
<td><table><tbody id="relations_table">
@@ -77,7 +68,17 @@ <h1>Begin RFC status change review</h1>
7768
{{ form.non_field_errors }}
7869
</td>
7970
</tr>
80-
{% endif %}
71+
{% for field in form.visible_fields %}
72+
<tr>
73+
<th>{{ field.label_tag }}:</th>
74+
<td>
75+
{% if field.label == "Document name" %}status-change-{% endif %}
76+
{{ field }}
77+
{% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
78+
79+
{{ field.errors }}
80+
</td>
81+
</tr>
8182
{% endfor %}
8283
<tr>
8384
<td colspan="2" class="actions">

‎ietf/templates/doc/status_change/status_changes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<h1>RFC Status Changes</h1>
66

77
{% if user|in_group:"Area_Director,Secretariat" %}
8-
<p><a href="{% url start_rfc_status_change %}">Start new RFC status change document</a></p>
8+
<p><a href="{% url start_rfc_status_change name='' %}">Start new RFC status change document</a></p>
99
{% endif %}
1010
{% regroup docs by get_state as state_groups %}
1111
<table class="ietf-table ietf-doctable">

‎ietf/templates/idrfc/doc_tab_document.html‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,32 @@
4747

4848
{% block doc_metabuttons %}
4949
{% if user|in_group:"Area_Director,Secretariat" %}
50-
<div style="padding-bottom:2px;">
51-
{% ifequal doc.draft_status "Expired" %}
52-
{% if not doc.resurrect_requested_by %}
53-
<span id="doc_request_resurrect_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_request_resurrect name=doc.draft_name %}">Request resurrect</a></span></span>
54-
{% endif %}
55-
{% if user|in_group:"Secretariat" %}
56-
<span id="doc_resurrect_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_resurrect name=doc.draft_name %}">Resurrect</a></span></span>
57-
{% endif %}
58-
{% else %}
59-
{% if stream_info.stream.name == 'ISE' or stream_info.stream.name == 'IRTF' %}
60-
{% if user|in_group:"Secretariat" and not info.conflict_reviews %}
61-
<span id="doc_conflict_review_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}<span class="first-child"><a href="{{start_review_url}}">Begin IETF Conflict Review {% if not doc.underlying_document.intended_std_level %}(note that intended status is not set){% endif %}</a></span>{% endif %}</span>
62-
{% endif %}
63-
{% else %}
64-
{% if stream_info.stream.name == 'IETF'%}{%if not doc.in_ietf_process %}
65-
<span id="doc_add_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_info name=doc.draft_name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Begin IESG Processing</a></span>{% endif %}</span>
66-
{% endif %}{% endif %}
67-
{% endif %}
68-
{% endifequal %}
69-
70-
</div>
50+
<div style="padding-bottom:2px;">
51+
{% ifequal doc.draft_status "Expired" %}
52+
{% if not doc.resurrect_requested_by and user|in_group:"Area_Director" %}
53+
<span id="doc_request_resurrect_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_request_resurrect name=doc.draft_name %}">Request resurrect</a></span></span>
54+
{% endif %}
55+
{% if user|in_group:"Secretariat" %}
56+
<span id="doc_resurrect_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_resurrect name=doc.draft_name %}">Resurrect</a></span></span>
57+
{% endif %}
58+
{% else %} {# not expired #}
59+
{% if stream_info.stream.name == 'ISE' or stream_info.stream.name == 'IRTF' %}
60+
{% if user|in_group:"Secretariat" and not info.conflict_reviews %}
61+
<span id="doc_conflict_review_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}<span class="first-child"><a href="{{start_review_url}}">Begin IETF Conflict Review {% if not doc.underlying_document.intended_std_level %}(note that intended status is not set){% endif %}</a></span>{% endif %}</span>
62+
{% endif %}
63+
{% else %} {# Not a candidate for conflict review #}
64+
{% if stream_info.stream.name == 'IETF' and not doc.in_ietf_process %}
65+
<span id="doc_add_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_info name=doc.draft_name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Begin IESG Processing</a></span>{% endif %}</span>
66+
{% else %}
67+
{% if doc.underlying_document.get_state_slug == 'rfc' %}
68+
<span id="doc_start_status_change" class="yui-button yui-link-button" style="margin-left:2px;">{% url start_rfc_status_change name=doc.underlying_document.canonical_name as start_url %}{% if start_url %}<span class="first-child"><a href="{{start_url}}">Start {% if info.proposed_status_changes %}An Additional {% endif %}Status Change</a></span>{% endif %}</span>
69+
{% endif %}
70+
{% endif %}
71+
{% endif %}
72+
{% endifequal %}
73+
</div>
7174
{% endif %}{# if user in group #}
72-
{% endblock doc_metabuttons%}
75+
{% endblock doc_metabuttons %}
7376
</div> <!-- metabox -->
7477

7578
<div id="rfcText1">

‎ietf/templates/idrfc/doc_tab_document_rfc.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
{% if doc.updated_by %}<br />Updated by {{ doc.updated_by|urlize_ietf_docs }}{%endif %}
4242
{% if doc.obsoletes %}<br />Obsoletes {{ doc.obsoletes|urlize_ietf_docs }}{%endif %}
4343
{% if doc.updates %}<br />Updates {{ doc.updates|urlize_ietf_docs }}{%endif %}
44+
{% if info.status_changes %}<br />Status changed by {{ info.status_changes|urlize_ietf_docs }}{% endif %}
45+
{% if info.proposed_status_changes %}<br />Proposed status changes by {{ info.proposed_status_changes|urlize_ietf_docs }}{% endif %}
4446
{% if doc.also %}<br />Also Known As {{ doc.also|urlize_ietf_docs }}{%endif %}
4547
{% if doc.draft_name %}<br />Was <a href="/doc/{{ doc.draft_name}}/">{{doc.draft_name}}</a>{% endif %}
4648
{% if doc.has_errata %}<br /><a href="http://www.rfc-editor.org/errata_search.php?rfc={{doc.rfc_number}}" rel="nofollow">Errata</a>{% endif %}

0 commit comments

Comments
 (0)