user_action_log_introduction #2

Merged
mpeltriaux merged 4 commits from user_action_log_introduction into master 2021-07-30 12:22:03 +02:00
2 changed files with 21 additions and 3 deletions
Showing only changes of commit 5858a5fdf9 - Show all commits

View File

@ -18,6 +18,24 @@ class CompensationTableFilter(InterventionTableFilter):
"""
def _filter_show_all(self, queryset, name, value) -> QuerySet:
""" Filters queryset depending on value of 'show_all' setting
Args:
queryset ():
name ():
value ():
Returns:
"""
if not value:
return queryset.filter(
intervention__users__in=[self.user], # requesting user has access
)
else:
return queryset
def _filter_show_recorded(self, queryset, name, value) -> QuerySet:
""" Filters queryset depending on value of 'show_recorded' setting

View File

@ -100,9 +100,6 @@ class Compensation(BaseObject):
related_name='compensations'
)
# Users having access on this object
users = models.ManyToManyField(User)
@staticmethod
def _generate_new_identifier() -> str:
""" Generates a new identifier for the intervention object
@ -153,3 +150,6 @@ class EcoAccount(Compensation):
with some kind of currency. From this account one is able to 'withdraw' currency for current projects.
"""
handler = models.CharField(max_length=500, null=True, blank=True, help_text="Who is responsible for handling the actions")
# Users having access on this object
users = models.ManyToManyField(User)