diff --git a/accounting/models.py b/accounting/models.py index 9b111f61..6fb1a6c8 100644 --- a/accounting/models.py +++ b/accounting/models.py @@ -328,6 +328,12 @@ class Operation(models.Model): def __str__(self): return f"{self.amount} € | {self.date} | {self.accounting_type} | {self.done}" + def __getattribute__(self, attr): + if attr == "target": + return self.get_target() + else: + return object.__getattribute__(self, attr) + def save(self, *args, **kwargs): if self.number is None: self.number = self.journal.operations.count() + 1 @@ -337,12 +343,6 @@ class Operation(models.Model): def get_absolute_url(self): return reverse("accounting:journal_details", kwargs={"j_id": self.journal.id}) - def __getattribute__(self, attr): - if attr == "target": - return self.get_target() - else: - return object.__getattribute__(self, attr) - def clean(self): super().clean() if self.date is None: diff --git a/club/tests.py b/club/tests.py index a9b7e2e6..53ac5ff7 100644 --- a/club/tests.py +++ b/club/tests.py @@ -265,7 +265,7 @@ class TestClubModel(TestClub): for membership in memberships.select_related("user"): user = membership.user expected_html += ( - f"" + f'' f"{user.get_display_name()}" f"{settings.SITH_CLUB_ROLES[membership.role]}" f"{membership.description}" diff --git a/core/models.py b/core/models.py index 4748f311..29c622fe 100644 --- a/core/models.py +++ b/core/models.py @@ -1366,6 +1366,18 @@ class PageRev(models.Model): class Meta: ordering = ["date"] + def __getattribute__(self, attr): + if attr == "owner_group": + return self.page.owner_group + elif attr == "edit_groups": + return self.page.edit_groups + elif attr == "view_groups": + return self.page.view_groups + elif attr == "unset_lock": + return self.page.unset_lock + else: + return object.__getattribute__(self, attr) + def __str__(self): return str(self.__dict__) @@ -1379,18 +1391,6 @@ class PageRev(models.Model): def get_absolute_url(self): return reverse("core:page", kwargs={"page_name": self.page._full_name}) - def __getattribute__(self, attr): - if attr == "owner_group": - return self.page.owner_group - elif attr == "edit_groups": - return self.page.edit_groups - elif attr == "view_groups": - return self.page.view_groups - elif attr == "unset_lock": - return self.page.unset_lock - else: - return object.__getattribute__(self, attr) - def can_be_edited_by(self, user): return self.page.can_be_edited_by(user) diff --git a/counter/models.py b/counter/models.py index 1467c9f4..dc043509 100644 --- a/counter/models.py +++ b/counter/models.py @@ -514,11 +514,6 @@ class Counter(models.Model): def __str__(self): return self.name - def get_absolute_url(self) -> str: - if self.type == "EBOUTIC": - return reverse("eboutic:main") - return reverse("counter:details", kwargs={"counter_id": self.id}) - def __getattribute__(self, name: str): if name == "edit_groups": return Group.objects.filter( @@ -526,6 +521,11 @@ class Counter(models.Model): ).all() return object.__getattribute__(self, name) + def get_absolute_url(self) -> str: + if self.type == "EBOUTIC": + return reverse("eboutic:main") + return reverse("counter:details", kwargs={"counter_id": self.id}) + def is_owned_by(self, user: User) -> bool: if user.is_anonymous: return False @@ -1045,14 +1045,6 @@ class CashRegisterSummary(models.Model): def __str__(self): return "At %s by %s - Total: %s €" % (self.counter, self.user, self.get_total()) - def save(self, *args, **kwargs): - if not self.id: - self.date = timezone.now() - return super().save(*args, **kwargs) - - def get_absolute_url(self): - return reverse("counter:cash_summary_list") - def __getattribute__(self, name): if name[:5] == "check": checks = self.items.filter(is_check=True).order_by("value").all() @@ -1089,6 +1081,14 @@ class CashRegisterSummary(models.Model): else: return object.__getattribute__(self, name) + def save(self, *args, **kwargs): + if not self.id: + self.date = timezone.now() + return super().save(*args, **kwargs) + + def get_absolute_url(self): + return reverse("counter:cash_summary_list") + def is_owned_by(self, user): """Method to see if that object can be edited by the given user.""" if user.is_anonymous: diff --git a/galaxy/models.py b/galaxy/models.py index 9316aacf..f306884d 100644 --- a/galaxy/models.py +++ b/galaxy/models.py @@ -525,7 +525,7 @@ class Galaxy(models.Model): self.logger.info( f"Progression: {user1_count}/{rulable_users_count} citizen -- {rulable_users_count - user1_count} remaining" ) - self.logger.info(f"Speed: {60.0*global_avg_speed:.2f} citizen per minute") + self.logger.info(f"Speed: {60.0 * global_avg_speed:.2f} citizen per minute") # We can divide the computed ETA by 2 because each loop, there is one citizen less to check, and maths tell # us that this averages to a division by two diff --git a/trombi/models.py b/trombi/models.py index 214eda4a..8771778b 100644 --- a/trombi/models.py +++ b/trombi/models.py @@ -63,9 +63,7 @@ class Trombi(models.Model): comments_deadline = models.DateField( _("comments deadline"), default=date.today, - help_text=_( - "After this date, users won't be " "able to make comments anymore." - ), + help_text=_("After this date, users won't be able to make comments anymore."), ) max_chars = models.IntegerField( _("maximum characters"), diff --git a/trombi/views.py b/trombi/views.py index 7f43e199..513a0d9c 100644 --- a/trombi/views.py +++ b/trombi/views.py @@ -479,10 +479,7 @@ class TrombiCommentFormView(LoginRequiredMixin, View): ) if self.trombi.comments_deadline < date.today(): raise Http404( - _( - "You can not write comment anymore, the deadline is " - "already passed." - ) + _("You can not write comment anymore, the deadline is already passed.") ) return modelform_factory( self.model,