diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 4f74436c..b90e8e6f 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -77,6 +77,9 @@ require 'travis/model' else @_super(key) + formattedFinishedAt: (-> + moment(@get('finishedAt')).format('lll') + ).property('finishedAt') @Travis.Build.reopenClass byRepoId: (id, parameters) -> diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index e89b53c8..c2ad2d86 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -102,6 +102,13 @@ require 'travis/model' @get('state') in ['passed', 'failed', 'errored', 'canceled'] ).property('state') + # TODO: such formattings should be done in controller, but in order + # to use it there easily, I would have to refactor job and build + # controllers + formattedFinishedAt: (-> + moment(@get('finishedAt')).format('lll') + ).property('finishedAt') + @Travis.Job.reopenClass queued: -> filtered = Ember.FilteredRecordArray.create( diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs index cbedfa5e..9e1baff4 100644 --- a/assets/scripts/app/templates/builds/list.hbs +++ b/assets/scripts/app/templates/builds/list.hbs @@ -52,7 +52,7 @@ {{formatDuration duration}} - + {{formatTime finishedAt}} {{/view}} diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index c1901dc6..bf8e5354 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -15,7 +15,7 @@
{{t builds.state}}
{{capitalize build.state}}
{{t builds.finished_at}}
-
{{formatTime build.finishedAt}}
+
{{formatTime build.finishedAt}}
{{t builds.duration}}
{{formatDuration build.duration}}
@@ -44,7 +44,7 @@ {{/with}} - +
{{t builds.message}}
{{formatMessage build.commit.message repoBinding=build.repo}}
diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs index 016ab67a..4429a4d9 100644 --- a/assets/scripts/app/templates/jobs/list.hbs +++ b/assets/scripts/app/templates/jobs/list.hbs @@ -32,7 +32,7 @@ {{formatDuration duration}} - + {{formatTime finishedAt}} {{#each value in configValues}} diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index b10d8229..ebee6825 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -14,7 +14,7 @@
{{t jobs.state}}
{{capitalize job.state}}
{{t jobs.finished_at}}
-
{{formatTime job.finishedAt}}
+
{{formatTime job.finishedAt}}
{{t jobs.duration}}
{{formatDuration job.duration}}