Skip to content

Commit b4dfae1

Browse files
committed
Integrate old patch for warning on the request for publication page if
intended std level and consensus is not filled in for the draft before sending it (as per discussion with Alice Russo) - the consensus check is skipped for ISE drafts - Legacy-Id: 7103
1 parent 1dd422e commit b4dfae1

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

ietf/doc/views_draft.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,8 @@ def request_publication(request, name):
11781178
if not is_authorized_in_doc_stream(request.user, doc):
11791179
return HttpResponseForbidden("You do not have the necessary permissions to view this page")
11801180

1181+
consensus_event = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
1182+
11811183
m = Message()
11821184
m.frm = request.user.person.formatted_email()
11831185
m.to = "RFC Editor <rfc-editor@rfc-editor.org>"
@@ -1247,6 +1249,7 @@ def request_publication(request, name):
12471249
doc=doc,
12481250
message=m,
12491251
next_state=next_state,
1252+
consensus_filled_in=consensus_event != None,
12501253
),
12511254
context_instance = RequestContext(request))
12521255

ietf/templates/doc/draft/request_publication.html

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
{% block title %}Request publication for {{ doc }}{% endblock %}
44

55
{% block morecss %}
6+
p.warning { color: #a00; font-weight: bold; }
67
form.request-publication #id_subject,
78
form.request-publication #id_body { width: 50em; }
8-
99
form.request-publication #id_body { height: 30em; }
1010
{% endblock %}
1111

@@ -15,6 +15,15 @@ <h1>Request publication for {{ doc }}</h1>
1515
<p>Send a publication request to the RFC Editor for {{ doc }} and move
1616
it to the <em>{{ next_state.name }}</em> stream state.</p>
1717

18+
{% if not doc.intended_std_level %}
19+
<p class="warning">Note: Intended RFC status is not set for the document.</p>
20+
{% endif %}
21+
22+
{% if doc.stream_id != "ise" and not consensus_filled_in %}
23+
<p class="warning">Note: Consensus status is not set for the document.</p>
24+
{% endif %}
25+
26+
1827
<p>Please edit the message and remove any parts in brackets you do not
1928
fill in. For independent submissions, see the <a
2029
href="http://www.rfc-editor.org/indsubs.html">guidelines</a>.</p>
@@ -27,9 +36,9 @@ <h1>Request publication for {{ doc }}</h1>
2736
<tr><td style="vertical-align: top">Message:</td> <td>{{ form.body }} {{ form.body.errors }}</td></tr>
2837
<tr class="actions"><td></td>
2938
<td>
30-
<a href="{% url "doc_view" name=doc.name %}">Back</a>
31-
<input name="reset" type="submit" value="Reset"/>
32-
<input type="submit" value="Send request to the RFC Editor"/>
39+
<a class="button" href="{% url "doc_view" name=doc.name %}">Cancel</a>
40+
<input class="button" name="reset" type="submit" value="Reset"/>
41+
<input class="button" type="submit" value="Send request to the RFC Editor"/>
3342
</td>
3443
</tr>
3544
</table>

0 commit comments

Comments
 (0)