suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix finishedAt tooltips and show dates in local time zone

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-10-01 11:24:56 +02:00
parent 6d086d7b3e
commit 4bb331686c
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/scripts/app/models/build.coffee
View File

@ -77,6 +77,9 @@ require 'travis/model'
else else
@_super(key) @_super(key)
formattedFinishedAt: (->
moment(@get('finishedAt')).format('lll')
).property('finishedAt')
@Travis.Build.reopenClass @Travis.Build.reopenClass
byRepoId: (id, parameters) -> byRepoId: (id, parameters) ->

7
assets/scripts/app/models/job.coffee
View File

@ -102,6 +102,13 @@ require 'travis/model'
@get('state') in ['passed', 'failed', 'errored', 'canceled'] @get('state') in ['passed', 'failed', 'errored', 'canceled']
).property('state') ).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 @Travis.Job.reopenClass
queued: -> queued: ->
filtered = Ember.FilteredRecordArray.create( filtered = Ember.FilteredRecordArray.create(

2
assets/scripts/app/templates/builds/list.hbs
View File

@ -52,7 +52,7 @@
<td class="duration" {{bindAttr title="duration"}}> <td class="duration" {{bindAttr title="duration"}}>
{{formatDuration duration}} {{formatDuration duration}}
</td> </td>
<td class="finished_at timeago" {{bindAttr title="finishedAt"}}> <td class="finished_at timeago" {{bindAttr title="formattedFinishedAt"}}>
{{formatTime finishedAt}} {{formatTime finishedAt}}
</td> </td>
{{/view}} {{/view}}

2
assets/scripts/app/templates/builds/show.hbs
View File

@ -15,7 +15,7 @@
<dt>{{t builds.state}}</dt> <dt>{{t builds.state}}</dt>
<dd class="state">{{capitalize build.state}}</dd> <dd class="state">{{capitalize build.state}}</dd>
<dt class="finished_at_label">{{t builds.finished_at}}</dt> <dt class="finished_at_label">{{t builds.finished_at}}</dt>
<dd class="finished_at timeago" {{bindAttr title="finishedAt"}}>{{formatTime build.finishedAt}}</dd> <dd class="finished_at timeago" {{bindAttr title="build.formattedFinishedAt"}}>{{formatTime build.finishedAt}}</dd>
<dt>{{t builds.duration}}</dt> <dt>{{t builds.duration}}</dt>
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd> <dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd>
</div> </div>

2
assets/scripts/app/templates/jobs/list.hbs
View File

@ -32,7 +32,7 @@
<td class="duration" {{bindAttr title="startedAt"}}> <td class="duration" {{bindAttr title="startedAt"}}>
{{formatDuration duration}} {{formatDuration duration}}
</td> </td>
<td class="finished_at timeago" {{bindAttr title="finishedAt"}}> <td class="finished_at timeago" {{bindAttr title="formattedFinishedAt"}}>
{{formatTime finishedAt}} {{formatTime finishedAt}}
</td> </td>
{{#each value in configValues}} {{#each value in configValues}}

2
assets/scripts/app/templates/jobs/show.hbs
View File

@ -14,7 +14,7 @@
<dt>{{t jobs.state}}</dt> <dt>{{t jobs.state}}</dt>
<dd class="state">{{capitalize job.state}}</dd> <dd class="state">{{capitalize job.state}}</dd>
<dt class="finished_at_label">{{t jobs.finished_at}}</dt> <dt class="finished_at_label">{{t jobs.finished_at}}</dt>
<dd class="finished_at timeago" {{bindAttr title="finishedAt"}}>{{formatTime job.finishedAt}}</dd> <dd class="finished_at timeago" {{bindAttr title="job.formattedFinishedAt"}}>{{formatTime job.finishedAt}}</dd>
<dt>{{t jobs.duration}}</dt> <dt>{{t jobs.duration}}</dt>
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration job.duration}}</dd> <dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration job.duration}}</dd>
</div> </div>