Fix job view
This commit is contained in:
parent
a3f8e0ff7d
commit
075e714fc3
|
@ -17,6 +17,7 @@ require 'controllers/build'
|
||||||
require 'controllers/builds'
|
require 'controllers/builds'
|
||||||
require 'controllers/flash'
|
require 'controllers/flash'
|
||||||
require 'controllers/home'
|
require 'controllers/home'
|
||||||
|
require 'controllers/job'
|
||||||
require 'controllers/profile'
|
require 'controllers/profile'
|
||||||
require 'controllers/repos'
|
require 'controllers/repos'
|
||||||
require 'controllers/repo'
|
require 'controllers/repo'
|
||||||
|
|
6
assets/scripts/app/controllers/job.coffee
Normal file
6
assets/scripts/app/controllers/job.coffee
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
Travis.JobController = Em.Controller.extend
|
||||||
|
needs: ['repo']
|
||||||
|
|
||||||
|
jobBinding: 'controllers.repo.job'
|
||||||
|
repoBinding: 'controllers.repo.repo'
|
||||||
|
commitBinding: 'job.commit'
|
|
@ -382,10 +382,10 @@ Travis.Router.map ->
|
||||||
@resource 'repo', path: '/:owner/:name', ->
|
@resource 'repo', path: '/:owner/:name', ->
|
||||||
@route 'index', path: '/'
|
@route 'index', path: '/'
|
||||||
@resource 'build', path: '/builds/:build_id'
|
@resource 'build', path: '/builds/:build_id'
|
||||||
|
@resource 'job', path: '/jobs/:job_id'
|
||||||
|
|
||||||
Travis.IndexCurrentRoute = Ember.Route.extend
|
Travis.IndexCurrentRoute = Ember.Route.extend
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
@render 'repo'
|
|
||||||
@render 'build', outlet: 'pane', into: 'repo'
|
@render 'build', outlet: 'pane', into: 'repo'
|
||||||
|
|
||||||
setupController: ->
|
setupController: ->
|
||||||
|
@ -394,15 +394,8 @@ Travis.IndexCurrentRoute = Ember.Route.extend
|
||||||
Travis.BuildRoute = Ember.Route.extend
|
Travis.BuildRoute = Ember.Route.extend
|
||||||
renderTemplate: (->)
|
renderTemplate: (->)
|
||||||
|
|
||||||
|
|
||||||
deserialize: (params) ->
|
|
||||||
Travis.Build.find(params.build_id)
|
|
||||||
|
|
||||||
serialize: (model, params) ->
|
serialize: (model, params) ->
|
||||||
id = if model.get
|
id = if model.get then model.get('id') else model
|
||||||
model.get('id')
|
|
||||||
else
|
|
||||||
model
|
|
||||||
|
|
||||||
{ build_id: id }
|
{ build_id: id }
|
||||||
|
|
||||||
|
@ -410,8 +403,25 @@ Travis.BuildRoute = Ember.Route.extend
|
||||||
model = Travis.Build.find(model) if model && !model.get
|
model = Travis.Build.find(model) if model && !model.get
|
||||||
|
|
||||||
repo = @container.lookup('controller:repo')
|
repo = @container.lookup('controller:repo')
|
||||||
repo.activate('build')
|
|
||||||
repo.set('build', model)
|
repo.set('build', model)
|
||||||
|
repo.activate('build')
|
||||||
|
|
||||||
|
Travis.JobRoute = Ember.Route.extend
|
||||||
|
renderTemplate: ->
|
||||||
|
@render 'job', outlet: 'pane', into: 'repo'
|
||||||
|
|
||||||
|
serialize: (model, params) ->
|
||||||
|
id = if model.get then model.get('id') else model
|
||||||
|
|
||||||
|
{ job_id: id }
|
||||||
|
|
||||||
|
setupController: (controller, model) ->
|
||||||
|
model = Travis.Job.find(model) if model && !model.get
|
||||||
|
|
||||||
|
repo = @container.lookup('controller:repo')
|
||||||
|
console.log model.toString()
|
||||||
|
repo.set('job', model)
|
||||||
|
repo.activate('job')
|
||||||
|
|
||||||
Travis.RepoIndexRoute = Ember.Route.extend
|
Travis.RepoIndexRoute = Ember.Route.extend
|
||||||
setupController: (controller, model) ->
|
setupController: (controller, model) ->
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<td class="number">
|
<td class="number">
|
||||||
<span class="status"></span>
|
<span class="status"></span>
|
||||||
{{#if job.id}}
|
{{#if job.id}}
|
||||||
<a {{action showJob repo job href=true}}>{{number}}</a>
|
{{#linkTo job repo job}}{{number}}{{/linkTo}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
<td class="duration" {{bindAttr title="startedAt"}}>
|
<td class="duration" {{bindAttr title="startedAt"}}>
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
{{#with view}}
|
|
||||||
{{#if job.isLoaded}}
|
{{#if job.isLoaded}}
|
||||||
<div {{bindAttr class="view.color"}}>
|
<div {{bindAttr class="view.color"}}>
|
||||||
<dl id="summary">
|
<dl id="summary">
|
||||||
|
@ -7,7 +6,7 @@
|
||||||
<dd class="number">
|
<dd class="number">
|
||||||
<span class="status"></span>
|
<span class="status"></span>
|
||||||
{{#if job.id}}
|
{{#if job.id}}
|
||||||
<a {{action showJob repo job href=true}}>{{job.number}}</a>
|
{{#linkTo job repo job}}{{job.number}}{{/linkTo}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</dd>
|
</dd>
|
||||||
<dt>{{t jobs.state}}</dt>
|
<dt>{{t jobs.state}}</dt>
|
||||||
|
@ -48,4 +47,3 @@
|
||||||
<span>Loading</span>
|
<span>Loading</span>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/with}}
|
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
else
|
else
|
||||||
'showJob'
|
'showJob'
|
||||||
|
|
||||||
Travis.app.get('router').urlForEvent(event, repo, item)
|
#Travis.get('router').urlForEvent(event, repo, item)
|
||||||
).property('job.repo', 'parentView.currentItem')
|
).property('job.repo', 'parentView.currentItem')
|
||||||
|
|
||||||
PreView: Em.View.extend
|
PreView: Em.View.extend
|
||||||
|
|
Loading…
Reference in New Issue
Block a user