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
36539d04
Verified
Commit
36539d04
authored
Jun 05, 2019
by
Sébastiaan Versteeg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove mark all present feature from events
parent
a303a39c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
44 deletions
+1
-44
website/events/admin.py
website/events/admin.py
+0
-4
website/events/admin_views.py
website/events/admin_views.py
+0
-34
website/events/locale/nl/LC_MESSAGES/django.mo
website/events/locale/nl/LC_MESSAGES/django.mo
+0
-0
website/events/locale/nl/LC_MESSAGES/django.po
website/events/locale/nl/LC_MESSAGES/django.po
+1
-5
website/events/locale/nl/LC_MESSAGES/djangojs.mo
website/events/locale/nl/LC_MESSAGES/djangojs.mo
+0
-0
website/events/templates/events/admin/details.html
website/events/templates/events/admin/details.html
+0
-1
No files found.
website/events/admin.py
View file @
36539d04
...
...
@@ -226,10 +226,6 @@ class EventAdmin(DoNextTranslatedModelAdmin):
self
.
admin_site
.
admin_view
(
admin_views
.
EventRegistrationEmailsExport
.
as_view
()),
name
=
'events_event_export_email'
),
path
(
'<int:pk>/all-present/'
,
self
.
admin_site
.
admin_view
(
admin_views
.
EventRegistrationsMarkPresent
.
as_view
()),
name
=
'events_event_all_present'
),
path
(
'<int:pk>/message/'
,
self
.
admin_site
.
admin_view
(
admin_views
.
EventMessage
.
as_view
(
admin
=
self
)),
...
...
website/events/admin_views.py
View file @
36539d04
...
...
@@ -293,37 +293,3 @@ class EventRegistrationEmailsExport(TemplateView, PermissionRequiredMixin):
context
[
'addresses'
]
=
addresses
context
[
'no_addresses'
]
=
no_addresses
return
context
@
method_decorator
(
staff_member_required
,
name
=
'dispatch'
)
@
method_decorator
(
organiser_only
,
name
=
'dispatch'
)
class
EventRegistrationsMarkPresent
(
View
,
PermissionRequiredMixin
):
"""
Renders a page that outputs all email addresses of registered members
for an event
"""
template_name
=
'events/admin/email_export.html'
permission_required
=
'events.change_registration'
def
get
(
self
,
request
,
pk
):
"""
Mark all registrations of an event as present
:param request: the request object
:param pk: the primary key of the event
:return: HttpResponse 302 to the event admin page
"""
event
=
get_object_or_404
(
Event
,
pk
=
pk
)
if
event
.
max_participants
is
None
:
registrations_query
=
event
.
registration_set
.
filter
(
date_cancelled
=
None
)
else
:
registrations_query
=
(
event
.
registration_set
.
filter
(
date_cancelled
=
None
)
.
order_by
(
'date'
)[:
event
.
max_participants
])
event
.
registration_set
.
filter
(
pk__in
=
registrations_query
).
update
(
present
=
True
,
payment
=
Registration
.
PAYMENT_CASH
)
return
redirect
(
'admin:events_event_details'
,
event
.
pk
)
website/events/locale/nl/LC_MESSAGES/django.mo
View file @
36539d04
This diff was suppressed by a .gitattributes entry.
website/events/locale/nl/LC_MESSAGES/django.po
View file @
36539d04
...
...
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-
07 19:5
6+0200\n"
"POT-Creation-Date: 2019-08-
14 08:0
6+0200\n"
"PO-Revision-Date: 2019-08-07 19:57+0200\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
...
...
@@ -487,10 +487,6 @@ msgstr "Exporteer aanmeldingen"
msgid "Export email addresses of attendees"
msgstr "Exporteer e-mailadressen van aanwezigen"
#: templates/events/admin/details.html
msgid "Set all registered to paid and present"
msgstr "Zet iedereen op betaald en present"
#: templates/events/admin/details.html
msgid "Send pushnotification to registered users"
msgstr "Stuur pushnotificatie naar participerende gebruikers"
...
...
website/events/locale/nl/LC_MESSAGES/djangojs.mo
View file @
36539d04
This diff was suppressed by a .gitattributes entry.
website/events/templates/events/admin/details.html
View file @
36539d04
...
...
@@ -54,7 +54,6 @@
<br>
<a
href=
"{% url 'admin:events_event_export' pk=event.pk %}"
class=
"button"
>
{% trans "Export registrations" %}
</a>
<a
href=
"{% url 'admin:events_event_export_email' pk=event.pk %}"
class=
"button"
>
{% trans "Export email addresses of attendees" %}
</a>
<a
href=
"{% url 'admin:events_event_all_present' pk=event.pk %}"
class=
"button"
>
{% trans "Set all registered to paid and present" %}
</a>
<a
href=
"{% url 'admin:events_event_message' pk=event.pk %}"
class=
"button"
>
{% trans "Send pushnotification to registered users" %}
</a>
</div>
</div>
...
...
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