From 0e648329f7b54e60693109ad6f3cc74537c6d960 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Mon, 13 Apr 2020 16:46:00 +0100 Subject: [PATCH] Use aware time in audit --- assets/tests/test_assets.py | 7 ++++--- assets/views.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/tests/test_assets.py b/assets/tests/test_assets.py index 6d03204f..2647d0f3 100644 --- a/assets/tests/test_assets.py +++ b/assets/tests/test_assets.py @@ -15,6 +15,7 @@ from selenium.webdriver.common.keys import Keys from selenium.webdriver.support.ui import WebDriverWait from RIGS.test_functional import animation_is_finished import datetime +from django.utils import timezone class TestAssetList(AutoLoginTest): @@ -299,9 +300,9 @@ class TestAssetAudit(AutoLoginTest): self.assertEqual(audited.description, new_desc) # Make sure audit 'log' was filled out self.assertEqual(self.profile.initials, audited.last_audited_by.initials) - self.assertEqual(datetime.datetime.now().date(), audited.last_audited_at.date()) - self.assertEqual(datetime.datetime.now().hour, audited.last_audited_at.hour) - self.assertEqual(datetime.datetime.now().minute, audited.last_audited_at.minute) + self.assertEqual(timezone.now().date(), audited.last_audited_at.date()) + self.assertEqual(timezone.now().hour, audited.last_audited_at.hour) + self.assertEqual(timezone.now().minute, audited.last_audited_at.minute) # Check we've removed it from the 'needing audit' list self.assertNotIn(asset_id, self.page.assets) diff --git a/assets/views.py b/assets/views.py index a2431291..c748fa05 100644 --- a/assets/views.py +++ b/assets/views.py @@ -14,6 +14,7 @@ from RIGS import versioning import simplejson import datetime +from django.utils import timezone @method_decorator(csrf_exempt, name='dispatch') @@ -202,7 +203,7 @@ class AssetAudit(AssetEdit): # TODO For some reason this doesn't stick when done in form_valid?? asset = self.get_object() asset.last_audited_by = self.request.user - asset.last_audited_at = datetime.datetime.now() + asset.last_audited_at = timezone.now() asset.save() return super().get_success_url()