Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
concrexit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
thalia
concrexit
Merge requests
!1428
Events on personal ical feed are now excluded if someone deregistered
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Events on personal ical feed are now excluded if someone deregistered
963-remove-cancelled-registration-from-personal-ical
into
master
Overview
0
Commits
2
Changes
1
Merged
Simcha van Collem
requested to merge
963-remove-cancelled-registration-from-personal-ical
into
master
5 years ago
Overview
0
Commits
2
Changes
1
Expand
Closes
#963 (closed)
Previous behaviour
Steps to reproduce:
Deregister from event
Download personal iCal feed
See the event despite you deregistered
New behaviour
Steps to validate that it works:
Deregister from event
Download personal iCal feed
No event there
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
1a9c0e88
2 commits,
5 years ago
1 file
+
2
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
website/events/feeds.py
+
2
−
1
Options
@@ -39,7 +39,8 @@ class EventFeed(ICalFeed):
if
self
.
user
:
query
&=
(
Q
(
registration_start__isnull
=
True
)
|
Q
(
registration__member
=
self
.
user
))
(
Q
(
registration__member
=
self
.
user
)
&
Q
(
registration__date_cancelled
=
None
)))
return
Event
.
objects
.
filter
(
query
).
order_by
(
'
-start
'
)
Loading