Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ClockedSchedule and PeriodicTasks showing UTC time when Time Zone is enabled. #464

Merged
merged 4 commits into from
Dec 17, 2021
Merged

Fix ClockedSchedule and PeriodicTasks showing UTC time when Time Zone is enabled. #464

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3947863
Fix ClockedSchedule showing UTC time and ignoring Timezone
Dec 3, 2021
13d403a
Force datatime to have timezone information
Dec 15, 2021
6333d67
Merge branch 'celery:master' into master
moreaba Dec 15, 2021
b0a7df3
Force datatime to have timezone information-removing unused import
Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion django_celery_beat/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from .utils import make_aware, now
from .clockedschedule import clocked

from django.utils.timezone import localtime

DAYS = 'days'
HOURS = 'hours'
Expand Down Expand Up @@ -220,7 +221,8 @@ class Meta:
ordering = ['clocked_time']

def __str__(self):
return '{}'.format(self.clocked_time)
return localtime(self.clocked_time).strftime("%d %B %Y %I:%M %p")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can unit test added for this change?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think return '{}'.format(make_aware(self.clocked_time)) is better.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes @lvelvee I believe so.
I have done another commit with this change after fetching the new base code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

# return '{}'.format(self.clocked_time)

@property
def schedule(self):
Expand Down