From da3a02f7ff65e2c7e21e1190b5d8c2e529f6decf Mon Sep 17 00:00:00 2001 From: Maksudul Haque Date: Tue, 25 Oct 2022 22:44:06 +0600 Subject: [PATCH 1/3] Fix `RecurringRule` and `OccurringRule` model `__str__` method --- events/models.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/events/models.py b/events/models.py index 3334ca326..ff7a3e3b5 100644 --- a/events/models.py +++ b/events/models.py @@ -237,7 +237,10 @@ class OccurringRule(RuleMixin, models.Model): def __str__(self): strftime = settings.SHORT_DATETIME_FORMAT - return f'{self.event.title} {date(self.dt_start.strftime, strftime)} - {date(self.dt_end.strftime, strftime)}' + return ( + f'{self.event.title} {date(self.dt_start, strftime)} - ' + f'{date(self.dt_end, strftime)}' + ) @property def begin(self): @@ -283,8 +286,11 @@ class RecurringRule(RuleMixin, models.Model): all_day = models.BooleanField(default=False) def __str__(self): - strftime = settings.SHORT_DATETIME_FORMAT - return f'{self.event.title} every {timedelta_nice_repr(self.interval)} since {date(self.dt_start.strftime, strftime)}' + return ( + f'{self.event.title} every ' + f'{timedelta_nice_repr(self.freq_interval_as_timedelta)} since ' + f'{date(self.dt_start, settings.SHORT_DATETIME_FORMAT)}' + ) def to_rrule(self): return rrule( From 9a979bfc7b316517aa4a13756e20d2da3d9fb7a9 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 12 Sep 2024 18:09:55 -0500 Subject: [PATCH 2/3] Update events/models.py --- events/models.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/events/models.py b/events/models.py index ff7a3e3b5..4b20c0a10 100644 --- a/events/models.py +++ b/events/models.py @@ -237,10 +237,7 @@ class OccurringRule(RuleMixin, models.Model): def __str__(self): strftime = settings.SHORT_DATETIME_FORMAT - return ( - f'{self.event.title} {date(self.dt_start, strftime)} - ' - f'{date(self.dt_end, strftime)}' - ) + return f'{self.event.title} {date(self.dt_start, strftime)} - {date(self.dt_end, strftime)}' @property def begin(self): From 75d889b701da548588b95397b5d4ac6fd2a4a54a Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 12 Sep 2024 18:10:04 -0500 Subject: [PATCH 3/3] Update events/models.py --- events/models.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/events/models.py b/events/models.py index 4b20c0a10..b41d92b22 100644 --- a/events/models.py +++ b/events/models.py @@ -283,11 +283,8 @@ class RecurringRule(RuleMixin, models.Model): all_day = models.BooleanField(default=False) def __str__(self): - return ( - f'{self.event.title} every ' - f'{timedelta_nice_repr(self.freq_interval_as_timedelta)} since ' - f'{date(self.dt_start, settings.SHORT_DATETIME_FORMAT)}' - ) + return (f'{self.event.title} every {timedelta_nice_repr(self.freq_interval_as_timedelta)} since ' + f'{date(self.dt_start, settings.SHORT_DATETIME_FORMAT)}') def to_rrule(self): return rrule(