From 84c238d35f411886f630b62e38425fb3d88fed40 Mon Sep 17 00:00:00 2001
From: Richard Jones <r1chardj0n3s@gmail.com>
Date: Fri, 18 Nov 2016 04:17:18 +0000
Subject: [PATCH] Revert "In Images Overview, dates should be properly
 formatted"

This fails when the test is run in a non-UTC timezone.

This reverts commit 8baf0b8fcbfc7fe13e4a714fe488294c0796b81c.

Change-Id: Ib043a86d544f511c540f59f2b46f21ac7b05312d
---
 horizon/static/framework/util/filters/filters.js          | 8 ++++----
 horizon/static/framework/util/filters/filters.spec.js     | 4 ++--
 .../static/app/core/images/images.module.js               | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/horizon/static/framework/util/filters/filters.js b/horizon/static/framework/util/filters/filters.js
index 52e396249d..3efcc36fdb 100644
--- a/horizon/static/framework/util/filters/filters.js
+++ b/horizon/static/framework/util/filters/filters.js
@@ -50,12 +50,12 @@
    * @ngdoc filter
    * @name simpleDate
    * @description
-   * Evaluates given iso date input as local timezone of the locale.
+   * Evaluates given for display as a short date, returning '-' if empty.
    */
-  function simpleDateFilter() {
+  simpleDateFilter.$inject = ['$filter'];
+  function simpleDateFilter($filter) {
     return function (input) {
-      var d = new Date(input);
-      return d.toLocaleString(horizon.languageCode);
+      return $filter('noValue')($filter('date')(input, 'short'));
     };
   }
 
diff --git a/horizon/static/framework/util/filters/filters.spec.js b/horizon/static/framework/util/filters/filters.spec.js
index e3a2c407bc..2ed211fcd8 100644
--- a/horizon/static/framework/util/filters/filters.spec.js
+++ b/horizon/static/framework/util/filters/filters.spec.js
@@ -45,11 +45,11 @@
       }));
 
       it('returns blank if nothing', function () {
-        expect(simpleDateFilter()).toBe('Invalid Date');
+        expect(simpleDateFilter()).toBe('-');
       });
 
       it('returns the expected time', function() {
-        expect(simpleDateFilter('2016-06-24T04:19:07')).toBe('6/24/2016, 4:19:07 AM');
+        expect(simpleDateFilter('2016-06-24T04:19:07')).toBe('6/24/16 4:19 AM');
       });
     });
 
diff --git a/openstack_dashboard/static/app/core/images/images.module.js b/openstack_dashboard/static/app/core/images/images.module.js
index 1df405dbb4..148bd17c1a 100644
--- a/openstack_dashboard/static/app/core/images/images.module.js
+++ b/openstack_dashboard/static/app/core/images/images.module.js
@@ -241,14 +241,14 @@
       name: gettext('Name'),
       owner: gettext('Owner'),
       tags: gettext('Tags'),
-      updated_at: {label: gettext('Updated At'), filters: ['simpleDate']},
+      updated_at: gettext('Updated At'),
       virtual_size: gettext('Virtual Size'),
       visibility: gettext('Visibility'),
       description: gettext('Description'),
       architecture: gettext('Architecture'),
       kernel_id: gettext('Kernel ID'),
       ramdisk_id: gettext('Ramdisk ID'),
-      created_at: {label: gettext('Created At'), filters: ['simpleDate']},
+      created_at: gettext('Created At'),
       container_format: { label: gettext('Container Format'), filters: ['uppercase'] },
       disk_format: { label: gettext('Disk Format'), filters: ['noValue', 'uppercase'] },
       is_public: { label: gettext('Is Public'), filters: ['yesno'] },