Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
thalia
concrexit
Commits
572122b6
Commit
572122b6
authored
Sep 28, 2016
by
Luuk Scholten
Committed by
Sébastiaan Versteeg
Oct 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix attendee view events
- Correct image for non-members - Only show members which have not cancelled
parent
7b1b9d52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
website/events/templates/events/event.html
website/events/templates/events/event.html
+3
-1
website/events/views.py
website/events/views.py
+1
-1
No files found.
website/events/templates/events/event.html
View file @
572122b6
...
@@ -217,7 +217,9 @@
...
@@ -217,7 +217,9 @@
{% if registration.is_external %}
{% if registration.is_external %}
<a
href=
"#"
>
<a
href=
"#"
>
<div
class=
"post-inner"
>
<div
class=
"post-inner"
>
<div
class=
"inner-img"
>
{% static "members/images/default-avatar.jpg" %}
</div>
<div
class=
"inner-img"
>
<img
src=
"{% static "
members
/
images
/
default-avatar.jpg
"
%}"
>
</div>
<div
class=
"post-overlay"
>
<div
class=
"post-overlay"
>
<div
class=
"post-overlay-meta"
>
<div
class=
"post-overlay-meta"
>
<h2>
{{ registration.name }}
</h2>
<h2>
{{ registration.name }}
</h2>
...
...
website/events/views.py
View file @
572122b6
...
@@ -103,7 +103,7 @@ def event(request, event_id):
...
@@ -103,7 +103,7 @@ def event(request, event_id):
Event
.
objects
.
filter
(
published
=
True
),
Event
.
objects
.
filter
(
published
=
True
),
pk
=
event_id
pk
=
event_id
)
)
registrations
=
event
.
registration_set
.
all
(
)
registrations
=
event
.
registration_set
.
filter
(
date_cancelled
=
None
)
context
=
{
context
=
{
'event'
:
event
,
'event'
:
event
,
...
...
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