Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions ietf/mailtrigger/migrations/0002_slidesubmitter.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Copyright The IETF Trust 2023, All Rights Reserved

from django.db import migrations

def forward(apps, schema_editor):
MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
Recipient = apps.get_model("mailtrigger", "Recipient")
r = Recipient.objects.create(
slug="slides_proposer",
desc="Person who proposed slides",
template="{{ proposer.email }}"
)
mt = MailTrigger.objects.get(slug="slides_proposed")
mt.cc.add(r)

def reverse(apps, schema_editor):
MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
Recipient = apps.get_model("mailtrigger", "Recipient")
mt = MailTrigger.objects.get(slug="slides_proposed")
r = Recipient.objects.get(slug="slides_proposer")
mt.cc.remove(r)
r.delete()

class Migration(migrations.Migration):
dependencies = [
("mailtrigger", "0001_initial"),
]

operations = [
migrations.RunPython(forward, reverse)
]
2 changes: 1 addition & 1 deletion ietf/meeting/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2887,7 +2887,7 @@ def propose_session_slides(request, session_id, num):
submission.filename = filename
submission.save()

(to, cc) = gather_address_lists('slides_proposed', group=session.group).as_strings()
(to, cc) = gather_address_lists('slides_proposed', group=session.group, proposer=request.user.person).as_strings()
msg_txt = render_to_string("meeting/slides_proposed.txt", {
"to": to,
"cc": cc,
Expand Down
26 changes: 18 additions & 8 deletions ietf/name/fixtures/names.json
Original file line number Diff line number Diff line change
Expand Up @@ -5590,7 +5590,9 @@
},
{
"fields": {
"cc": [],
"cc": [
"slides_proposer"
],
"desc": "Recipients when slides are proposed for a given session",
"to": [
"group_chairs",
Expand Down Expand Up @@ -6381,6 +6383,14 @@
"model": "mailtrigger.recipient",
"pk": "session_requests"
},
{
"fields": {
"desc": "Person who proposed slides",
"template": "{{ proposer.email }}"
},
"model": "mailtrigger.recipient",
"pk": "slides_proposer"
},
{
"fields": {
"desc": "The managers of any related streams",
Expand Down Expand Up @@ -13224,7 +13234,7 @@
"desc": "Flipchars",
"name": "Flipcharts",
"order": 0,
"used": true
"used": false
},
"model": "name.roomresourcename",
"pk": "flipcharts"
Expand Down Expand Up @@ -13274,7 +13284,7 @@
"desc": "Experimental Room Setup (U-Shape and classroom, subject to availability)",
"name": "Experimental Room Setup (U-Shape and classroom)",
"order": 0,
"used": true
"used": false
},
"model": "name.roomresourcename",
"pk": "u-shape"
Expand Down Expand Up @@ -16429,7 +16439,7 @@
"fields": {
"command": "xym",
"switch": "--version",
"time": "2023-06-21T07:09:38.578Z",
"time": "2023-07-17T07:09:47.664Z",
"used": true,
"version": "xym 0.7.0"
},
Expand All @@ -16440,7 +16450,7 @@
"fields": {
"command": "pyang",
"switch": "--version",
"time": "2023-06-21T07:09:38.928Z",
"time": "2023-07-17T07:09:48.075Z",
"used": true,
"version": "pyang 2.5.3"
},
Expand All @@ -16451,7 +16461,7 @@
"fields": {
"command": "yanglint",
"switch": "--version",
"time": "2023-06-21T07:09:38.948Z",
"time": "2023-07-17T07:09:48.104Z",
"used": true,
"version": "yanglint SO 1.9.2"
},
Expand All @@ -16462,9 +16472,9 @@
"fields": {
"command": "xml2rfc",
"switch": "--version",
"time": "2023-06-21T07:09:39.903Z",
"time": "2023-07-17T07:09:49.075Z",
"used": true,
"version": "xml2rfc 3.17.3"
"version": "xml2rfc 3.17.4"
},
"model": "utils.versioninfo",
"pk": 4
Expand Down