Skip to content

Commit 3176bea

Browse files
levkowetzlevkowetz
committed
Added new RFC-Editor state tag 'AUTH48-DONE' to the rfc-ed-queue mirror script.
 - Legacy-Id: 4634
1 parent 7a96c77 commit 3176bea

11 files changed

Lines changed: 100 additions & 46 deletions

File tree

‎ietf/doc/admin.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,9 @@ class BallotPositionDocEventAdmin(DocEventAdmin):
140140

141141
admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin)
142142

143+
class RelatedDocumentAdmin(admin.ModelAdmin):
144+
list_display = ['source', 'target', 'relationship', ]
145+
list_filter = ['relationship', ]
146+
search_fields = ['source__name', 'target__name', 'target__document__name', ]
147+
raw_id_fields = ['source', 'target', ]
148+
admin.site.register(RelatedDocument, RelatedDocumentAdmin)

‎ietf/idrfc/mirror_rfc_editor_queue.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def get_rfc_state_mapping():
213213
return {
214214
'AUTH': State.objects.get_or_create(type=t, slug='auth', name='AUTH', desc="Awaiting author action")[0],
215215
'AUTH48': State.objects.get_or_create(type=t, slug='auth48', name="AUTH48", desc="Awaiting final author approval")[0],
216+
'AUTH48-DONE': State.objects.get_or_create(type=t, slug='auth48done', name="AUTH48-DONE", desc="Final approvals are complete")[0],
216217
'EDIT': State.objects.get_or_create(type=t, slug='edit', name='EDIT', desc="Approved by the stream manager (e.g., IESG, IAB, IRSG, ISE), awaiting processing and publishing")[0],
217218
'IANA': State.objects.get_or_create(type=t, slug='iana-crd', name='IANA', desc="RFC-Editor/IANA Registration Coordination")[0],
218219
'IESG': State.objects.get_or_create(type=t, slug='iesg', name='IESG', desc="Holding for IESG action")[0],

‎ietf/idtracker/templatetags/ietf_filters.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,13 @@ def user_roles_json(user):
466466
roles[g.name] = True
467467
return mark_safe(simplejson.dumps(roles))
468468

469+
@register.filter
470+
def textify(text):
471+
text = re.sub("</?b>", "*", text)
472+
text = re.sub("</?i>", "/", text)
473+
# There are probably additional conversions we should apply here
474+
return text
475+
469476
def _test():
470477
import doctest
471478
doctest.testmod()

‎ietf/templates/community/public/notification_email.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
{% autoescape off %}
1+
{% autoescape off %}{% load ietf_filters %}
22
Hello,
33

4-
This is a notification from {{ clist.long_name }}.
4+
This is a notification from the {{ clist.long_name }}.
55

6-
Document: {{ notification.doc }}
6+
Document: {{ notification.doc }},
7+
https://datatracker.ietf.org/doc/{{ notification.doc }}
78

89
Change:
9-
{{ notification.desc }}
10+
{{ notification.desc|textify|striptags }}
1011

1112
Best regards,
1213

13-
The datatracker login manager service
14+
The datatracker draft tracking service
1415
(for the IETF Secretariat)
1516
{% endautoescape %}

‎ietf/templates/meeting/agenda.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% load humanize %}{% autoescape off %}{% load ietf_filters %}"Date","Start","End","Session","Room","Area","Acronym","Type","Description","Session ID","Agenda","Slides"
22
{% for slot in timeslots %}{% ifchanged %}{% if slot.reg_info %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.registration.time_desc|slice:":4" }}","{{ slot.registration.time_desc|slice:"5:9" }}","Registration","{{ venue.reg_area_name }}","","","","{{ slot.registration.name }}","r{{slot.day_id}}","",""
33
{% endif %}{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.break_info.time_desc|slice:":4" }}","{{ slot.break_info.time_desc|slice:"5:9" }}","Break","{{ venue.break_area_name }}","","","","{{ slot.break_info.name }}","b{{slot.time_id}}","",""
4-
{% endif %}{% endif %}{% for session in slot.sessions_by_area %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.time_desc|slice:":4" }}","{{ slot.time_desc|slice:"5:9" }}","{{ slot.session_name }}","{{ session.info.room_id.room_name }}","{{ session.info.area|upper }}","{{ session.info.acronym }}","{{ session.info.group_type_str }}","{{ session.info.acronym_name }}","{{session.info.pk}}","{% if session.info.agenda_file %}http://datatracker.ietf.org/meeting/{{ meeting.num }}/agenda/{{ session.info.acronym }}-agenda/{% endif %}","{% if session.info.slides %}{% for slide in session.info.slides %}http://www.ietf.org/proceedings/{{ slide.file_loc }}{% if not forloop.last %}|{% endif %}{% endfor %}{% endif %}"
4+
{% endif %}{% endif %}{% for session in slot.sessions_by_area %}"{{ slot.meeting_date|date:"Y-m-d" }}","{{ slot.time_desc|slice:":4" }}","{{ slot.time_desc|slice:"5:9" }}","{{ slot.session_name }}","{{ session.info.room_id.room_name }}","{{ session.info.area|upper }}","{{ session.info.acronym }}","{{ session.info.group_type_str }}","{{ session.info.acronym_name }}","{{session.info.pk}}","{% if session.info.agenda_file %}http://datatracker.ietf.org/meeting/{{ meeting.num }}/agenda/{{ session.info.acronym }}/{% endif %}","{% if session.info.slides %}{% for slide in session.info.slides %}http://www.ietf.org/proceedings/{{ slide.file_loc }}{% if not forloop.last %}|{% endif %}{% endfor %}{% endif %}"
55
{% endfor %}{% endfor %}{% endautoescape %}

‎ietf/templates/registration/confirm.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div id="confirm_account_page">
77
<h1>Confirm account creation</h1>
88
{% if success %}
9-
<p>Your account with login name '{{ email }}' has been created, using the password you have select.</p>
9+
<p>Your account with login name '{{ email }}' has been created, using the password you have selected.</p>
1010
<p>Now you can <a href="{% url ietfauth.views.ietf_login %}">sign in</a></p>
1111
{% else %}
1212
<p>In order to complete the setup of your account with login name '{{ email }}', please set a password:</p>

‎ietf/templates/submit/announce_new_version.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{% autoescape off %}New version (-{{ submission.revision }}) has been submitted for {{ submission.filename }}-{{ submission.revision }}.txt:
1+
{% autoescape off %}
2+
A new version (-{{ submission.revision }}) has been submitted for {{ submission.filename }}:
23
http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
34
{% if msg %}
45
{{ msg|striptags }}

‎ietf/templates/submit/confirm_autopost.txt‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
{% autoescape off %}Follow this link to confirm your Auto-Post of
2-
{{ draft.filename }}-{{ draft.revision }}:
1+
{% autoescape off %}
2+
Hi,
33

4-
I-D Submission Tool URL: {{ confirm_url|safe }}
4+
The IETF datatracker draft submission service has received your draft
5+
{{ draft.filename }}-{{ draft.revision }}, and requires a
6+
confirmation step in order to be able to complete the posting of
7+
the draft.
8+
9+
Please follow this link to the page where you can confirm the posting:
10+
{{ confirm_url|safe }}
11+
12+
13+
Best regards,
14+
15+
The IETF Secretariat
16+
through the draft submission service
517

6-
Remember that you can cancel the submission from:
7-
{{ status_url|safe }}
818
{% endautoescape %}

‎ietf/templates/submit/manual_post_mail.txt‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1-
{% autoescape off %}Manual posting has been requested for the following Internet-Draft:
1+
{% autoescape off %}
2+
Hi,
23

3-
I-D Submission Tool URL: {{ url }}
4+
Manual posting has been requested for the following Internet-Draft:
45

5-
File name: {{ draft.filename }}
6-
Version: {{ draft.revision }}
7-
Submission date: {{ draft.submission_date }}
8-
WG: {{ draft.group_acronym|default:"Individual Submission" }} {% if form.validation.warnings.group %}*Please note that this WG is not an active one*{% endif %}
6+
I-D Submission Tool URL:
7+
{{ url }}
98

10-
Title: {{ draft.id_document_name }}
11-
Document date: {{ draft.creation_date }}
12-
Abstract: {{ draft.abstract }}
13-
Pages: {{ draft.txt_page_count }}
14-
File size: {{ draft.filesize|filesizeformat }}
9+
File name : {{ draft.filename }}
10+
Version : {{ draft.revision }}
11+
Submission date : {{ draft.submission_date }}
12+
WG : {{ draft.group_acronym|default:"Individual Submission" }} {% if form.validation.warnings.group %}*Please note that this WG is not an active one*{% endif %}
1513

16-
Submitter: {{ submitter.get_full_name }} <{{ submitter.email.1 }}>
14+
Title : {{ draft.id_document_name }}
15+
Document date : {{ draft.creation_date }}
16+
Pages : {{ draft.txt_page_count }}
17+
File size : {{ draft.filesize|filesizeformat }}
1718

18-
Authors:
19-
{% for author in form.get_authors %}{{ author.get_full_name }} <{{ author.email.1 }}>
19+
Submitter : {{ submitter.get_full_name }} <{{ submitter.email.1 }}>
20+
21+
Abstract : {{ draft.abstract }}
22+
23+
24+
Authors:
25+
{% for author in form.get_authors %} {{ author.get_full_name }} <{{ author.email.1 }}>
2026
{% endfor %}
2127

28+
Comments to the secretariat:
29+
2230
{{ draft.comment_to_sec }}
2331
{% endautoescape %}

‎ietf/templates/submit/request_full_url.txt‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1-
{% autoescape off %}Follow this link to get full access to the submission of
2-
{{ submission.filename }}-{{ submission.revision }}:
1+
{% autoescape off %}
2+
Hi,
3+
4+
The datatracker has received a request to send out the link to the URL where you
5+
can confirm the submission of your draft {{ submission.filename }}-{{ submission.revision }}.
6+
7+
Please follow this link to get full access to the submission page:
8+
{{ url|safe }}
9+
10+
11+
Best regards,
12+
13+
The IETF Secretariat
14+
through the draft submission service
315

4-
{{ url|safe }}
516
{% endautoescape %}

0 commit comments

Comments
 (0)