Merge lp:~ltrager/maas/lp1598461_2.0 into lp:maas/2.0

[Lee Trager]

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

Backport of https://code.launchpad.net/~ltrager/maas/lp1598461/+merge/299371

[Lee Trager (ltrager)]

Merge has no changes, approved in other MP

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 18:17:11 +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 18:17:11 +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()