IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 37 Wiki Activity

master #303

Merged
mpeltriaux merged 10 commits from master into Docker 2023-02-23 10:24:38 +01:00
Conversation 0 Commits 10 Files Changed 31 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 073c39a970 - Show all commits

7
konova/views/home.py
View File

@ -35,6 +35,7 @@ def home_view(request: HttpRequest):
template = "konova/home.html" template = "konova/home.html"
now = timezone.now() now = timezone.now()
user = request.user user = request.user
user_teams = user.shared_teams
# Fetch the four newest active and published ServerMessages # Fetch the four newest active and published ServerMessages
msgs = ServerMessage.objects.filter( msgs = ServerMessage.objects.filter(
@ -51,7 +52,7 @@ def home_view(request: HttpRequest):
) )
# Then fetch only user related ones # Then fetch only user related ones
user_interventions = interventions.filter( user_interventions = interventions.filter(
Q(users__in=[user]) | Q(teams__in=user.shared_teams) Q(users__in=[user]) | Q(teams__in=user_teams)
).distinct() ).distinct()
# Repeat for other objects # Repeat for other objects
@ -59,13 +60,13 @@ def home_view(request: HttpRequest):
deleted=None, deleted=None,
) )
user_comps = comps.filter( user_comps = comps.filter(
Q(intervention__users__in=[user]) | Q(intervention__teams__in=user.shared_teams) Q(intervention__users__in=[user]) | Q(intervention__teams__in=user_teams)
).distinct() ).distinct()
eco_accs = EcoAccount.objects.filter( eco_accs = EcoAccount.objects.filter(
deleted=None, deleted=None,
) )
user_ecco_accs = eco_accs.filter( user_ecco_accs = eco_accs.filter(
Q(users__in=[user]) | Q(teams__in=user.shared_teams) Q(users__in=[user]) | Q(teams__in=user_teams)
).distinct() ).distinct()
additional_context = { additional_context = {