Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
b36a7db8
Verified
Commit
b36a7db8
authored
Jun 20, 2019
by
Sébastiaan Versteeg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add mailinglist for society chairs
parent
3651c4a3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
3 deletions
+26
-3
website/mailinglists/locale/nl/LC_MESSAGES/django.mo
website/mailinglists/locale/nl/LC_MESSAGES/django.mo
+0
-0
website/mailinglists/locale/nl/LC_MESSAGES/django.po
website/mailinglists/locale/nl/LC_MESSAGES/django.po
+9
-3
website/mailinglists/services.py
website/mailinglists/services.py
+12
-0
website/mailinglists/templates/admin/mailinglists/change_list.html
...ailinglists/templates/admin/mailinglists/change_list.html
+5
-0
No files found.
website/mailinglists/locale/nl/LC_MESSAGES/django.mo
View file @
b36a7db8
This diff was suppressed by a .gitattributes entry.
website/mailinglists/locale/nl/LC_MESSAGES/django.po
View file @
b36a7db8
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
8-12-05 19:46+01
00\n"
"PO-Revision-Date: 201
8-12-05 19:47+01
00\n"
"POT-Creation-Date: 201
9-06-20 16:49+02
00\n"
"PO-Revision-Date: 201
9-06-20 16:50+02
00\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2\n"
"X-Generator: Poedit 2.2
.3
\n"
#: admin.py models.py
msgid "List aliasses"
...
...
@@ -188,6 +188,12 @@ msgstr ""
"Gearchiveerde lijst die gebruikt kan worden om mail naar alle "
"commissievoorzitters te versturen."
#: templates/admin/mailinglists/change_list.html
msgid "Archived list that can be used to send mail to all society chairs."
msgstr ""
"Gearchiveerde lijst die gebruikt kan worden om mail naar alle "
"gezelschapvoorzitters te versturen."
#: templates/admin/mailinglists/change_list.html
msgid ""
"Archived list that can be used to send mail to all orientation mentors. "
...
...
website/mailinglists/services.py
View file @
b36a7db8
...
...
@@ -18,6 +18,15 @@ def get_automatic_lists():
Member
(
email
=
'intern@thalia.nu'
)
]
current_society_chairs
=
(
MemberGroupMembership
.
active_objects
.
filter
(
group__board
=
None
)
.
filter
(
group__committee
=
None
)
.
filter
(
chair
=
True
)
.
prefetch_related
(
'member'
))
society_chair_emails
=
[
x
.
member
for
x
in
current_society_chairs
]
+
[
Member
(
email
=
'intern@thalia.nu'
)
]
active_committee_memberships
=
(
MemberGroupMembership
.
active_objects
.
filter
(
group__board
=
None
)
.
filter
(
group__society
=
None
)
...
...
@@ -54,6 +63,9 @@ def get_automatic_lists():
lists
+=
_create_automatic_list
(
[
'commissievoorzitters'
,
'committeechairs'
],
'[THALIA] [CHAIRS]'
,
committee_chair_emails
,
moderated
=
False
)
lists
+=
_create_automatic_list
(
[
'gezelschapvoorzitters'
,
'societychairs'
],
'[THALIA] [SOCIETY]'
,
society_chair_emails
,
moderated
=
False
)
lists
+=
_create_automatic_list
(
[
'optin'
],
'[THALIA] [OPTIN]'
,
Member
.
current_members
.
filter
(
profile__receive_optin
=
True
),
...
...
website/mailinglists/templates/admin/mailinglists/change_list.html
View file @
b36a7db8
...
...
@@ -48,6 +48,11 @@
<td>
commissievoorzitters, committeechairs
</td>
<td>
{% trans "Archived list that can be used to send mail to all committee chairs." %}
</td>
</tr>
<tr>
<td></td>
<td>
gezelschapvoorzitters, societychairs
</td>
<td>
{% trans "Archived list that can be used to send mail to all society chairs." %}
</td>
</tr>
<tr>
<td></td>
<td>
mentors
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment