You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by dm...@apache.org on 2014/10/21 20:21:31 UTC
git commit: Use toLocalTime angular filter rather than duplicate
logic in controller.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 35d87bc8b -> 1a7e66174
Use toLocalTime angular filter rather than duplicate logic in controller.
Bugs closed: AURORA-873
Reviewed at https://reviews.apache.org/r/26956/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/1a7e6617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/1a7e6617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/1a7e6617
Branch: refs/heads/master
Commit: 1a7e66174dc08d9bf7316bb353496b1c8eb91af0
Parents: 35d87bc
Author: David McLaughlin <da...@dmclaughlin.com>
Authored: Tue Oct 21 11:21:20 2014 -0700
Committer: David McLaughlin <da...@dmclaughlin.com>
Committed: Tue Oct 21 11:21:20 2014 -0700
----------------------------------------------------------------------
src/main/resources/scheduler/assets/js/controllers.js | 2 +-
src/main/resources/scheduler/assets/taskStatus.html | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1a7e6617/src/main/resources/scheduler/assets/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/scheduler/assets/js/controllers.js b/src/main/resources/scheduler/assets/js/controllers.js
index f8e2eb7..092e7d5 100644
--- a/src/main/resources/scheduler/assets/js/controllers.js
+++ b/src/main/resources/scheduler/assets/js/controllers.js
@@ -546,7 +546,7 @@
function summarizeTaskEvents(taskEvents) {
return _.map(taskEvents, function (taskEvent) {
return {
- date: moment(taskEvent.timestamp).format('MM/DD h:mm:ss'),
+ timestamp: taskEvent.timestamp,
status: _.invert(ScheduleStatus)[taskEvent.status],
message: taskEvent.message
};
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1a7e6617/src/main/resources/scheduler/assets/taskStatus.html
----------------------------------------------------------------------
diff --git a/src/main/resources/scheduler/assets/taskStatus.html b/src/main/resources/scheduler/assets/taskStatus.html
index ae32866..821783a 100644
--- a/src/main/resources/scheduler/assets/taskStatus.html
+++ b/src/main/resources/scheduler/assets/taskStatus.html
@@ -29,11 +29,11 @@
<ul ng-if='showDetails'>
<li ng-repeat='taskEvent in dataRow.taskEvents'>
- {{taskEvent.date}} local -
+ {{taskEvent.timestamp | toLocalTime}} •
<span title='{{taskEvent.status | scheduleStatusTooltip}}'>
<span class='schedulingStatus'>{{taskEvent.status}}</span>
</span>
- <span ng-if='taskEvent.message'> - {{taskEvent.message}}</span>
+ <span ng-if='taskEvent.message'> • {{taskEvent.message}}</span>
</li>
</ul>
</div>