From 72f5495ebbafa67b470d074203886395d55014af Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 19 Jun 2012 14:15:04 +0000 Subject: [PATCH 1/9] Apparently, CHARTER_TXT_URL http://www.ietf.org/charters/ is really http://www.ietf.org/charter/, fix this in the settings.py file - Legacy-Id: 4468 --- ietf/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/settings.py b/ietf/settings.py index 08a78f678..3454250fb 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -193,7 +193,7 @@ INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/' INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/' RFC_PATH = '/a/www/ietf-ftp/rfc/' CHARTER_PATH = '/a/www/ietf-ftp/charters/' -CHARTER_TXT_URL = 'http://www.ietf.org/charters/' +CHARTER_TXT_URL = 'http://www.ietf.org/charter/' AGENDA_PATH = '/a/www/www6s/proceedings/' AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s' MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s' From a353acd7e6145296bf5adb341c53a2384d7e4bc5 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 19 Jun 2012 14:16:08 +0000 Subject: [PATCH 2/9] Fix link to charter .txt file on agenda page - Legacy-Id: 4469 --- ietf/iesg/views.py | 4 +++- ietf/templates/iesg/agenda_wg.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index f08e347f3..235cfcaba 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -274,11 +274,13 @@ def agenda_docs(date, next_agenda): def agenda_wg_actions(date): res = dict(("s%s%s%s" % (i, j, k), []) for i in range(2, 5) for j in range (1, 4) for k in range(1, 4)) - charters = Document.objects.filter(type="charter", docevent__telechatdocevent__telechat_date=date).distinct() + charters = Document.objects.filter(type="charter", docevent__telechatdocevent__telechat_date=date).select_related("group").distinct() for c in charters: if c.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date != date: continue + c.group.txt_link = settings.CHARTER_TXT_URL + "%s-%s.txt" % (c.canonical_name(), c.rev) + section_key = "s" + get_wg_section(c.group) if section_key not in res: res[section_key] = [] diff --git a/ietf/templates/iesg/agenda_wg.html b/ietf/templates/iesg/agenda_wg.html index 00ab643dd..f4a0bceb3 100644 --- a/ietf/templates/iesg/agenda_wg.html +++ b/ietf/templates/iesg/agenda_wg.html @@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {{ wg.obj.parent.acronym|upper }} {{ wg.obj.time|date:"M d"}} - + {{ wg.obj.name|escape }} ({{wg.obj.acronym}}) From bc6bd21b948547ee855e218747257ae0efe4d3a3 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 19 Jun 2012 14:32:18 +0000 Subject: [PATCH 3/9] Add CC for group mailing list in action/review emails, fixes issue #837. - Legacy-Id: 4470 --- ietf/templates/wgcharter/action_text.txt | 3 ++- ietf/templates/wgcharter/review_text.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ietf/templates/wgcharter/action_text.txt b/ietf/templates/wgcharter/action_text.txt index c12f58323..430c8a979 100644 --- a/ietf/templates/wgcharter/action_text.txt +++ b/ietf/templates/wgcharter/action_text.txt @@ -1,5 +1,6 @@ {% load ietf_filters %}{% autoescape off %}From: The IESG -To: IETF-Announce +To: IETF-Announce {% if wg.list_email %} +Cc: {{ wg.acronym }} WG <{{ wg.list_email }}> {% endif %} Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }}) {% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair{{ chairs|pluralize}}. diff --git a/ietf/templates/wgcharter/review_text.txt b/ietf/templates/wgcharter/review_text.txt index f56bbc4b2..fb8087f19 100644 --- a/ietf/templates/wgcharter/review_text.txt +++ b/ietf/templates/wgcharter/review_text.txt @@ -1,5 +1,6 @@ {% load ietf_filters %}{% autoescape off %}From: The IESG -To: IETF-Announce +To: IETF-Announce {% if wg.list_email %} +Cc: {{ wg.acronym }} WG <{{ wg.list_email }}> {% endif %} Subject: WG Review: {{ wg.name }} ({{ wg.acronym }}) {% filter wordwrap:73 %}{% ifequal review_type "new" %}A new IETF working group has been proposed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal review_type "recharter" %}The {{ wg.name }} ({{wg.acronym}}) working group in the {{ wg.parent.name }} of the IETF is undergoing rechartering.{% endifequal %} The IESG has not made any determination yet. The following draft charter was submitted, and is provided for informational purposes only. Please send your comments to the IESG mailing list (iesg at ietf.org) by {{ review_date }}. From 4cb42fd91ce2c5cfa47be2b8c9c1a6c47e93889b Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 19 Jun 2012 17:06:56 +0000 Subject: [PATCH 4/9] Include current milestones in charter action/review announcements, fixes issue #835. - Legacy-Id: 4473 --- ietf/templates/wgcharter/action_text.txt | 5 +---- ietf/templates/wgcharter/review_text.txt | 5 +---- ietf/templates/wgcharter/wg_info.txt | 4 ++++ ietf/wgcharter/mails.py | 2 ++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ietf/templates/wgcharter/action_text.txt b/ietf/templates/wgcharter/action_text.txt index 430c8a979..30f7435de 100644 --- a/ietf/templates/wgcharter/action_text.txt +++ b/ietf/templates/wgcharter/action_text.txt @@ -5,7 +5,4 @@ Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }}) {% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair{{ chairs|pluralize}}. -{% include "wgcharter/wg_info.txt" %} - -{% endfilter %} -{% endautoescape %} +{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %} diff --git a/ietf/templates/wgcharter/review_text.txt b/ietf/templates/wgcharter/review_text.txt index fb8087f19..a683516e9 100644 --- a/ietf/templates/wgcharter/review_text.txt +++ b/ietf/templates/wgcharter/review_text.txt @@ -5,7 +5,4 @@ Subject: WG Review: {{ wg.name }} ({{ wg.acronym }}) {% filter wordwrap:73 %}{% ifequal review_type "new" %}A new IETF working group has been proposed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal review_type "recharter" %}The {{ wg.name }} ({{wg.acronym}}) working group in the {{ wg.parent.name }} of the IETF is undergoing rechartering.{% endifequal %} The IESG has not made any determination yet. The following draft charter was submitted, and is provided for informational purposes only. Please send your comments to the IESG mailing list (iesg at ietf.org) by {{ review_date }}. -{% include "wgcharter/wg_info.txt" %} - -{% endfilter %} -{% endautoescape %} +{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %} diff --git a/ietf/templates/wgcharter/wg_info.txt b/ietf/templates/wgcharter/wg_info.txt index 8c0597df3..209768f97 100644 --- a/ietf/templates/wgcharter/wg_info.txt +++ b/ietf/templates/wgcharter/wg_info.txt @@ -22,3 +22,7 @@ Current Status: {{ wg.state.name }} Working Group Charter of Working Group: {{ charter_text }} + +Milestones: +{% for milestone in milestones %} {% if milestone.done %}Done {% else %}{{ milestone.expected_due_date|date:"M Y" }}{% endif %} - {{ milestone.desc|safe }} +{% endfor %} diff --git a/ietf/wgcharter/mails.py b/ietf/wgcharter/mails.py index 834c583e4..e59da36cc 100644 --- a/ietf/wgcharter/mails.py +++ b/ietf/wgcharter/mails.py @@ -79,6 +79,7 @@ def default_action_text(wg, charter, user): chairs=wg.role_set.filter(name="chair"), secr=wg.role_set.filter(name="secr"), techadv=wg.role_set.filter(name="techadv"), + milestones=wg.groupmilestone_set.all(), ad_email=wg.ad.role_email("ad") if wg.ad else None, action_type=action, )) @@ -98,6 +99,7 @@ def default_review_text(wg, charter, user): chairs=wg.role_set.filter(name="chair"), secr=wg.role_set.filter(name="secr"), techadv=wg.role_set.filter(name="techadv"), + milestones=wg.groupmilestone_set.all(), ad_email=wg.ad.role_email("ad") if wg.ad else None, review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(), review_type="new" if wg.state_id == "proposed" else "recharter", From 7538eab96f54b3ff44af73960096d01675c54e2c Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 19 Jun 2012 18:48:02 +0000 Subject: [PATCH 5/9] Fix flow of approval of charters/announcement of the WG action based on feedback from Cindy Morgan, now there's a link on the approval page to go to the edit page which sends you back upon saving, and the edit page doesn't provide a button to send the announcement since you should do that on the approve page (instead it provides a link). - Legacy-Id: 4474 --- ietf/templates/wgcharter/announcement_text.html | 10 ++++++++-- ietf/templates/wgcharter/approve.html | 3 ++- ietf/wgcharter/urls.py | 2 +- ietf/wgcharter/views.py | 6 +++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ietf/templates/wgcharter/announcement_text.html b/ietf/templates/wgcharter/announcement_text.html index 168d23c64..38113ef51 100644 --- a/ietf/templates/wgcharter/announcement_text.html +++ b/ietf/templates/wgcharter/announcement_text.html @@ -18,14 +18,20 @@ form #id_announcement_text {
Back - - + +
{% load ietf_filters %} {% if user|has_role:"Secretariat" %} +

Secretariat actions

+
+ {% if announcement == "action" %} + Go to charter approval page + {% else %} + {% endif %}
{% endif %} diff --git a/ietf/templates/wgcharter/approve.html b/ietf/templates/wgcharter/approve.html index 1fba5eed5..5287aec47 100644 --- a/ietf/templates/wgcharter/approve.html +++ b/ietf/templates/wgcharter/approve.html @@ -19,7 +19,7 @@ form.approve .announcement { {% endblock %} {% block content %} -

Approve {{ charter.canonical_name }}

+

Approve {{ charter.canonical_name }}-{{ charter.rev }}

IETF announcement:
@@ -31,6 +31,7 @@ form.approve .announcement {
Back + Go to edit/regenerate announcement page
diff --git a/ietf/wgcharter/urls.py b/ietf/wgcharter/urls.py index 2aa4c955f..e9b04b5ec 100644 --- a/ietf/wgcharter/urls.py +++ b/ietf/wgcharter/urls.py @@ -7,7 +7,7 @@ urlpatterns = patterns('', url(r'^(?P