Merge lp:~ltrager/maas/lp1598461 into lp:~maas-committers/maas/trunk

[Lee Trager]

Show image last update using the time format consistent with other areas of the MAAS UI

The images page is generated with a Django template. While we convert the last update field for Ubuntu images we let Django handle the conversion of a datetime object for other image types. Because we set USE_L10N = True in maas/settings.py Django converts the datetime object using its default format which differs from the format we use in the rest of MAAS.

[Gavin Panella (allenap)]

> While we convert the last update field for Ubuntu images we let Django
> handle the conversion of a datetime object for other image types.

That makes it sound like the fix in this branch is cosmetic only, in
that it makes everything look the same but isn't consistent.

It would be best if date fields for all images are treated consistently,
so that a future maintainer doesn't have to figure out which way to do
it.

> Because we set USE_L10N = True in maas/settings.py Django converts the
> datetime object using its default format which differs from the format
> we use in the rest of MAAS.

Perhaps we should switch this to False instead of overriding its effects
at the edges of the application? Any guesses as to what the fallout
would be?

review: Needs Information

[Lee Trager (ltrager)]

I removed USE_L10N so I could set DATETIME_FORMAT. This ensures that whenever a datetime object is used in a Django template it will always be in UTC with the same format the web sockets are using. I went through the UI and everything looks fine.

[Gavin Panella (allenap)]

Tip top, I think that's a better solution. There is the possibility of unintended consequences -- I bet USE_L10N acts at a distance on a lot of stuff in Django -- so the start of a dev cycle is the right time to do this.

review: Approve

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2016-06-07 19:59:49 +0000
+++ src/maas/settings.py	2016-07-08 00:04:26 +0000
@@ -156,9 +156,9 @@
 # to load the internationalization machinery.
 USE_I18N = True
 
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
+# Set the datetime format Django uses in templates to show the time in UTC.
+# The format is consistent with what the websockets use.
+DATETIME_FORMAT = 'D, d M. o H:i:s'
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"

=== modified file 'src/maasserver/views/tests/test_images.py'
--- src/maasserver/views/tests/test_images.py	2016-06-10 17:54:17 +0000
+++ src/maasserver/views/tests/test_images.py	2016-07-08 00:04:26 +0000
@@ -308,7 +308,11 @@
         last_update = doc.cssselect(
             'table#other-resources > tbody > '
             'tr > td')[5].text_content().strip()
-        self.assertNotEqual('not synced', last_update)
+        dt = datetime.datetime.strptime(last_update, '%a, %d %b. %Y %H:%M:%S')
+        # TimestampedModel includes microseconds which we don't print. To
+        # confirm the right time is returned its easiest to just compare the
+        # ctimes
+        self.assertEquals(cache.updated.ctime(), dt.ctime())
 
     def test_shows_number_of_nodes_for_synced_resource(self):
         self.client_log_in(as_admin=True)
@@ -480,6 +484,20 @@
             1, len(delete_btn),
             "Didn't show delete button for generated image.")
 
+    def test_shows_last_update_time_for_synced_resource(self):
+        self.client_log_in(as_admin=True)
+        resource = self.make_generated_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        last_update = doc.cssselect(
+            'table#generated-resources > tbody > '
+            'tr > td')[5].text_content().strip()
+        dt = datetime.datetime.strptime(last_update, '%a, %d %b. %Y %H:%M:%S')
+        # TimestampedModel includes microseconds which we don't print. To
+        # confirm the right time is returned its easiest to just compare the
+        # ctimes
+        self.assertEquals(resource.updated.ctime(), dt.ctime())
+
     def test_hides_delete_button_for_generated_resource_when_not_admin(self):
         self.client_log_in()
         self.make_generated_resource()
@@ -552,6 +570,20 @@
             'table#uploaded-resources > tbody > tr > td')[1].text_content()
         self.assertEqual(name, name_col.strip())
 
+    def test_shows_last_update_time_for_synced_resource(self):
+        self.client_log_in(as_admin=True)
+        resource = self.make_uploaded_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        last_update = doc.cssselect(
+            'table#uploaded-resources > tbody > '
+            'tr > td')[5].text_content().strip()
+        dt = datetime.datetime.strptime(last_update, '%a, %d %b. %Y %H:%M:%S')
+        # TimestampedModel includes microseconds which we don't print. To
+        # confirm the right time is returned its easiest to just compare the
+        # ctimes
+        self.assertEquals(resource.updated.ctime(), dt.ctime())
+
     def test_shows_delete_button_for_uploaded_resource(self):
         self.client_log_in(as_admin=True)
         self.make_uploaded_resource()