Make displaying build simpler
Since we fetch build in router now, we can just pass it to controller, instead of passing an id.
This commit is contained in:
parent
0e5bb55c7d
commit
3aefc86961
|
@ -48,7 +48,7 @@ Travis.RepositoryController = Travis.Controller.extend
|
||||||
|
|
||||||
viewBuild: ->
|
viewBuild: ->
|
||||||
@_bind('repository', 'repositoriesByParams.firstObject')
|
@_bind('repository', 'repositoriesByParams.firstObject')
|
||||||
@_bind('build', 'buildById')
|
@_bind('build', 'params.build')
|
||||||
@connectTab('build')
|
@connectTab('build')
|
||||||
|
|
||||||
viewJob: ->
|
viewJob: ->
|
||||||
|
@ -61,10 +61,6 @@ Travis.RepositoryController = Travis.Controller.extend
|
||||||
Travis.Repository.bySlug("#{@get('params.owner')}/#{@get('params.name')}")
|
Travis.Repository.bySlug("#{@get('params.owner')}/#{@get('params.name')}")
|
||||||
).property('params.owner', 'params.name')
|
).property('params.owner', 'params.name')
|
||||||
|
|
||||||
buildById: (->
|
|
||||||
Travis.Build.find(id) if id = @get('params.id')
|
|
||||||
).property('params.id')
|
|
||||||
|
|
||||||
jobById: (->
|
jobById: (->
|
||||||
Travis.Job.find(id) if id = @get('params.id')
|
Travis.Job.find(id) if id = @get('params.id')
|
||||||
).property('params.id')
|
).property('params.id')
|
||||||
|
|
|
@ -28,11 +28,11 @@ require 'travis/model'
|
||||||
|
|
||||||
requiredJobs: (->
|
requiredJobs: (->
|
||||||
@get('jobs').filter (data) -> !data.get('allowFailure')
|
@get('jobs').filter (data) -> !data.get('allowFailure')
|
||||||
).property('jobs.@each.allowFailure')
|
).property()
|
||||||
|
|
||||||
allowedFailureJobs: (->
|
allowedFailureJobs: (->
|
||||||
@get('jobs').filter (data) -> data.get('allowFailure')
|
@get('jobs').filter (data) -> data.get('allowFailure')
|
||||||
).property('jobs.@each.allowFailure')
|
).property()
|
||||||
|
|
||||||
configKeys: (->
|
configKeys: (->
|
||||||
return [] unless config = @get('config')
|
return [] unless config = @get('config')
|
||||||
|
|
|
@ -178,7 +178,7 @@ Travis.Router = Ember.Router.extend
|
||||||
show: Ember.Route.extend
|
show: Ember.Route.extend
|
||||||
route: '/:build_id'
|
route: '/:build_id'
|
||||||
connectOutlets: (router, build) ->
|
connectOutlets: (router, build) ->
|
||||||
router.get('repositoryController').activate 'build', id: build.get('id')
|
router.get('repositoryController').activate 'build', build: build
|
||||||
|
|
||||||
deserialize: (router, params) ->
|
deserialize: (router, params) ->
|
||||||
# Something is wrong here. If I don't use deferred, id is not
|
# Something is wrong here. If I don't use deferred, id is not
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user