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

HOTFIX: Team sharing

Browse Source 
* fixes bug where entries would show up on index views as they would be shared (are shared but using a 'deleted' Team, which still exists on the db)
This commit is contained in:
mpeltriaux 2022-05-31 12:58:35 +02:00
parent ab9af7ae2f
commit 8b67df7617
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compensation/filters.py
View File

@ -60,7 +60,7 @@ class CheckboxCompensationTableFilter(CheckboxTableFilter):
if not value: if not value:
return queryset.filter( return queryset.filter(
Q(intervention__users__in=[self.user]) | # requesting user has access Q(intervention__users__in=[self.user]) | # requesting user has access
Q(intervention__teams__users__in=[self.user]) Q(intervention__teams__in=self.user.shared_teams)
).distinct() ).distinct()
else: else:
return queryset return queryset

2
konova/filters/mixins.py
View File

@ -305,7 +305,7 @@ class ShareableTableFilterMixin(django_filters.FilterSet):
if not value: if not value:
return queryset.filter( return queryset.filter(
Q(users__in=[self.user]) | # requesting user has access Q(users__in=[self.user]) | # requesting user has access
Q(teams__users__in=[self.user]) Q(teams__in=self.user.shared_teams)
).distinct() ).distinct()
else: else:
return queryset return queryset