From 12fbe984b958c499b799edaba5a025327bd9940d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 15 May 2015 11:18:47 -0400 Subject: [PATCH] FINAL revert of commit: "Adding a date filter that will format dates in Tower UI""" This reverts commit 1945c04cd3dfbb33fe3c8139cee88c862cd75cab. --- .jshintrc | 3 +-- awx/ui/static/js/app.js | 3 +-- awx/ui/static/js/filters.js | 4 +--- awx/ui/static/js/filters/dates/long-date.filter.js | 6 ------ awx/ui/static/js/forms/LogViewerStatus.js | 4 ++-- awx/ui/static/js/helpers/EventViewer.js | 4 ++-- awx/ui/static/js/lists/AllJobs.js | 2 +- awx/ui/static/js/lists/CompletedJobs.js | 4 ++-- awx/ui/static/js/lists/Jobs.js | 2 +- awx/ui/static/js/lists/PortalJobs.js | 4 ++-- awx/ui/static/js/lists/Projects.js | 2 +- awx/ui/static/js/lists/ScheduledJobs.js | 6 +++--- awx/ui/static/js/lists/Schedules.js | 8 ++++---- awx/ui/static/js/lists/Streams.js | 4 ++-- awx/ui/static/js/widgets/Stream.js | 2 +- awx/ui/static/partials/job_detail.html | 4 ++-- awx/ui/static/partials/job_stdout_adhoc.html | 4 ++-- 17 files changed, 28 insertions(+), 38 deletions(-) delete mode 100644 awx/ui/static/js/filters/dates/long-date.filter.js diff --git a/.jshintrc b/.jshintrc index 0239abbde6..3ed9f59504 100644 --- a/.jshintrc +++ b/.jshintrc @@ -23,8 +23,7 @@ "it": false, "expect": false, "context": false, - "describe": false, - "moment": false + "describe": false }, "strict": false, "quotmark": false, diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js index e5695b7b82..b6d4e05c74 100644 --- a/awx/ui/static/js/app.js +++ b/awx/ui/static/js/app.js @@ -180,8 +180,7 @@ var tower = angular.module('Tower', [ 'CreateCustomInventoryHelper', 'CustomInventoryListDefinition', 'AdhocHelper', - 'features', - 'longDateFilter' + 'features' ]) .constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/') diff --git a/awx/ui/static/js/filters.js b/awx/ui/static/js/filters.js index be5d00ad85..aaf9f04c17 100644 --- a/awx/ui/static/js/filters.js +++ b/awx/ui/static/js/filters.js @@ -1,9 +1,7 @@ import sanitizeFilter from 'tower/filters/sanitize/xss-sanitizer.filter'; import capitalizeFilter from 'tower/filters/capitalize.filter'; -import longDateFilter from 'tower/filters/dates/long-date.filter'; export { sanitizeFilter, - capitalizeFilter, - longDateFilter + capitalizeFilter }; diff --git a/awx/ui/static/js/filters/dates/long-date.filter.js b/awx/ui/static/js/filters/dates/long-date.filter.js deleted file mode 100644 index e80c89b347..0000000000 --- a/awx/ui/static/js/filters/dates/long-date.filter.js +++ /dev/null @@ -1,6 +0,0 @@ -angular.module('longDateFilter', []).filter('longDate', function() { - return function(input) { - var date = moment(input); - return date.format('l LTS'); - }; -}); diff --git a/awx/ui/static/js/forms/LogViewerStatus.js b/awx/ui/static/js/forms/LogViewerStatus.js index a1b25e1e72..d3dc26c118 100644 --- a/awx/ui/static/js/forms/LogViewerStatus.js +++ b/awx/ui/static/js/forms/LogViewerStatus.js @@ -38,13 +38,13 @@ export default "started": { label: "Started", type: "date", - "filter": "longDate", + "filter": "date:'MM/dd/yy HH:mm:ss'", readonly: true }, "finished": { label: "Finished", type: "date", - "filter": "longDate", + "filter": "date:'MM/dd/yy HH:mm:ss'", readonly: true }, "elapsed": { diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js index 65a7ab2452..ff76bffc3d 100644 --- a/awx/ui/static/js/helpers/EventViewer.js +++ b/awx/ui/static/js/helpers/EventViewer.js @@ -423,10 +423,10 @@ export default else if (key === "start" || key === "end" || key === "created") { if (!/Z$/.test(itm)) { itm = itm.replace(/\ /,'T') + 'Z'; - html += $filter('longDate')(itm); + html += $filter('date')(itm, 'MM/dd/yy HH:mm:ss.sss'); } else { - html += $filter('longDate')(itm); + html += $filter('date')(itm, 'MM/dd/yy HH:mm:ss'); } } else if (key === "host_name" && event.host_id) { diff --git a/awx/ui/static/js/lists/AllJobs.js b/awx/ui/static/js/lists/AllJobs.js index 3cc5b0e7b5..fe194baa7d 100644 --- a/awx/ui/static/js/lists/AllJobs.js +++ b/awx/ui/static/js/lists/AllJobs.js @@ -52,7 +52,7 @@ export default label: 'Finished', noLink: true, searchable: false, - filter: "longDate", + filter: "date:'MM/dd HH:mm:ss'", columnClass: "col-lg-2 col-md-2 hidden-xs", key: true, desc: true diff --git a/awx/ui/static/js/lists/CompletedJobs.js b/awx/ui/static/js/lists/CompletedJobs.js index 18c72fe0c5..c3f8d2447d 100644 --- a/awx/ui/static/js/lists/CompletedJobs.js +++ b/awx/ui/static/js/lists/CompletedJobs.js @@ -9,7 +9,7 @@ export default - angular.module('CompletedJobsDefinition', ['sanitizeFilter', 'longDateFilter']) + angular.module('CompletedJobsDefinition', ['sanitizeFilter']) .value( 'CompletedJobsList', { name: 'completed_jobs', @@ -51,7 +51,7 @@ export default label: 'Finished', noLink: true, searchable: false, - filter: "longDate", + filter: "date:'MM/dd HH:mm:ss'", columnClass: "col-lg-2 col-md-2 hidden-xs", key: true, desc: true diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js index b7548d54d6..ce739ac4df 100644 --- a/awx/ui/static/js/lists/Jobs.js +++ b/awx/ui/static/js/lists/Jobs.js @@ -57,7 +57,7 @@ export default label: 'Started', noLink: true, searchable: false, - filter: "longDate", + filter: "date:'MM/dd HH:mm:ss'", columnClass: "col-lg-2 col-md-2 hidden-xs" }, type: { diff --git a/awx/ui/static/js/lists/PortalJobs.js b/awx/ui/static/js/lists/PortalJobs.js index 65a3539bda..00db6461e0 100644 --- a/awx/ui/static/js/lists/PortalJobs.js +++ b/awx/ui/static/js/lists/PortalJobs.js @@ -12,7 +12,7 @@ export default - angular.module('PortalJobsListDefinition', ['longDateFilter']) + angular.module('PortalJobsListDefinition', []) .value( 'PortalJobsList', { name: 'portal_jobs', @@ -58,7 +58,7 @@ export default label: 'Started', noLink: true, searchable: false, - filter: "longDate", + filter: "date:'MM/dd HH:mm:ss'", columnClass: "col-lg-3 col-md-3 hidden-xs" }, name: { diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 1e6552debc..84adf22b17 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -45,7 +45,7 @@ export default }, last_updated: { label: 'Last Updated', - filter: "longDate", + filter: "date:'MM/dd/yy HH:mm:ss'", columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs", excludeModal: true, searchable: false, diff --git a/awx/ui/static/js/lists/ScheduledJobs.js b/awx/ui/static/js/lists/ScheduledJobs.js index 72af30e578..08d470af43 100644 --- a/awx/ui/static/js/lists/ScheduledJobs.js +++ b/awx/ui/static/js/lists/ScheduledJobs.js @@ -9,7 +9,7 @@ export default - angular.module('ScheduledJobsDefinition', ['sanitizeFilter', 'longDateFilter']) + angular.module('ScheduledJobsDefinition', ['sanitizeFilter']) .value( 'ScheduledJobsList', { name: 'schedules', @@ -36,7 +36,7 @@ export default noLink: true, searchable: false, columnClass: "col-lg-2 col-md-2 hidden-xs", - filter: "longDate", + filter: "date:'MM/dd HH:mm:ss'", key: true }, type: { @@ -92,4 +92,4 @@ export default dataPlacement: 'top' } } - }); + }); \ No newline at end of file diff --git a/awx/ui/static/js/lists/Schedules.js b/awx/ui/static/js/lists/Schedules.js index e33b5e88a7..52e94d6187 100644 --- a/awx/ui/static/js/lists/Schedules.js +++ b/awx/ui/static/js/lists/Schedules.js @@ -29,19 +29,19 @@ export default }, dtstart: { label: 'First Run', - filter: "longDate", + filter: "date:'MM/dd/yy HH:mm:ss'", searchable: false, columnClass: "col-md-2 col-sm-3 hidden-xs" }, next_run: { label: 'Next Run', - filter: "longDate", + filter: "date:'MM/dd/yy HH:mm:ss'", searchable: false, columnClass: "col-md-2 col-sm-3 col-xs-3" }, dtend: { label: 'Final Run', - filter: "longDate", + filter: "date:'MM/dd/yy HH:mm:ss'", searchable: false, columnClass: "col-md-2 col-sm-3 hidden-xs" } @@ -96,4 +96,4 @@ export default dataPlacement: 'top' } } - }); + }); \ No newline at end of file diff --git a/awx/ui/static/js/lists/Streams.js b/awx/ui/static/js/lists/Streams.js index 7e2752b278..7cae0dc263 100644 --- a/awx/ui/static/js/lists/Streams.js +++ b/awx/ui/static/js/lists/Streams.js @@ -29,7 +29,7 @@ export default desc: true, noLink: true, searchable: false, - filter: "longDate", + filter: "date:'MM/dd/yy HH:mm:ss'" }, user: { label: 'Initiated by', @@ -281,4 +281,4 @@ export default } } - }); + }); \ No newline at end of file diff --git a/awx/ui/static/js/widgets/Stream.js b/awx/ui/static/js/widgets/Stream.js index 5afcd6d165..3000100012 100644 --- a/awx/ui/static/js/widgets/Stream.js +++ b/awx/ui/static/js/widgets/Stream.js @@ -300,7 +300,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti scope = generator.inject(form, { mode: 'edit', modal: true, related: false }); scope.changes = activity.changes_stringified; scope.user = ((activity.summary_fields.actor) ? activity.summary_fields.actor.username : 'system') + - ' on ' + $filter('longDate')(activity.timestamp); + ' on ' + $filter('date')(activity.timestamp, "MM/dd/yy HH:mm:ss"); scope.operation = activity.description_nolink; scope.formModalAction = function () { diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html index c8460083e8..371b143ab3 100644 --- a/awx/ui/static/partials/job_detail.html +++ b/awx/ui/static/partials/job_detail.html @@ -45,8 +45,8 @@
-
Started  {{ job_status.started | longDate }}
-
Finished  {{ job_status.finished | longDate }}
+
Started  {{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}
+
Finished  {{ job_status.finished | date:'MM/dd/yy HH:mm:ss' }}
Elapsed  {{ job_status.elapsed }}
diff --git a/awx/ui/static/partials/job_stdout_adhoc.html b/awx/ui/static/partials/job_stdout_adhoc.html index f001ba52ab..07796a5e9a 100644 --- a/awx/ui/static/partials/job_stdout_adhoc.html +++ b/awx/ui/static/partials/job_stdout_adhoc.html @@ -44,10 +44,10 @@
- Started  {{ job.started | longDate }} + Started  {{ job.started | date:'MM/dd/yy HH:mm:ss' }}
- Finished  {{ job.finished | longDate }} + Finished  {{ job.finished | date:'MM/dd/yy HH:mm:ss' }}
Elapsed  {{ job.elapsed }} seconds