Skip to content

Commit da3a02f

Browse files
committed
Fix RecurringRule and OccurringRule model __str__ method
1 parent e8e4c24 commit da3a02f

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

events/models.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@ class OccurringRule(RuleMixin, models.Model):
237237

238238
def __str__(self):
239239
strftime = settings.SHORT_DATETIME_FORMAT
240-
return f'{self.event.title} {date(self.dt_start.strftime, strftime)} - {date(self.dt_end.strftime, strftime)}'
240+
return (
241+
f'{self.event.title} {date(self.dt_start, strftime)} - '
242+
f'{date(self.dt_end, strftime)}'
243+
)
241244

242245
@property
243246
def begin(self):
@@ -283,8 +286,11 @@ class RecurringRule(RuleMixin, models.Model):
283286
all_day = models.BooleanField(default=False)
284287

285288
def __str__(self):
286-
strftime = settings.SHORT_DATETIME_FORMAT
287-
return f'{self.event.title} every {timedelta_nice_repr(self.interval)} since {date(self.dt_start.strftime, strftime)}'
289+
return (
290+
f'{self.event.title} every '
291+
f'{timedelta_nice_repr(self.freq_interval_as_timedelta)} since '
292+
f'{date(self.dt_start, settings.SHORT_DATETIME_FORMAT)}'
293+
)
288294

289295
def to_rrule(self):
290296
return rrule(

0 commit comments

Comments
 (0)