Show private activities too on calender when logged in #333
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EricTRL
requested changes
Sep 22, 2023
user_interaction/views.py
Outdated
| Activity.objects.filter(published_date__lte=timezone.now()) | ||
| .filter( | ||
| Q(type=ActivityType.ACTIVITY_PUBLIC) | ||
| | (Q(type=ActivityType.ACTIVITY_MEETING) & Q(organisers__members=self.request.member)) |
There was a problem hiding this comment.
I'm not sure what will happen if self.request.member = None. Might be useful to check that condition first just to be safe. Something along the lines of (pseudocode):
q = Q(PUBLIC-Q)
if member is not None:
q |= Q(MEETINGS-Q)
for activity in Activity.objects.filter(q):
...
How do you log out an user, Edit: |
Add a flake8 config file with a max line length so that stops complaining Add some pytest plugings so I can run the tests from VS code Some formatting changes Add if statement to check if member is none Try to change the input of the private meetings of the calendar (not finished yet) Add a button to subscribe to private meetings of the calendar (not finished yet) todo: tests
LenaWil
force-pushed
the
activity-meeting-maincalendar
branch
from
6e639a3 to
054284c
Compare
LenaWil
force-pushed
the
activity-meeting-maincalendar
branch
from
b9fd856 to
1aae130
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #333 +/- ##
==========================================
- Coverage 95.84% 95.81% -0.04%
==========================================
Files 161 161
Lines 7118 7137 +19
Branches 1166 1169 +3
==========================================
+ Hits 6822 6838 +16
- Misses 194 196 +2
- Partials 102 103 +1
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
EricTRL
reviewed
Oct 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise they are so hidden that it is useless. I am still working on the pr, but what do y’all think?
(I couldn’t quickly find where to set the user in the test)
Todo: