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

Merge pull request #352 from travis-ci/sf-include-api-builds

Browse Source 
Add eventType as an attribute, include api builds to the history
This commit is contained in:
Konstantin Haase 2015-05-06 17:19:15 +02:00
commit 870c6703b1
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/build.coffee
View File

@ -17,6 +17,7 @@ Build = Model.extend DurationCalculations,
pullRequest: DS.attr('boolean')
pullRequestTitle: DS.attr()
pullRequestNumber: DS.attr('number')
eventType: DS.attr('string')
repo: DS.belongsTo('repo', async: true)
commit: DS.belongsTo('commit', async: true)
@ -33,11 +34,6 @@ Build = Model.extend DurationCalculations,
@reload()
).property('_config')
# TODO add eventType to the api for api build requests
eventType: (->
if @get('pullRequest') then 'pull_request' else 'push'
).property('pullRequest')
isPullRequest: (->
@get('eventType') == 'pull_request' || @get('pullRequest')
).property('eventType')

4
app/models/repo.coffee
View File

@ -50,8 +50,8 @@ Repo = Model.extend
builds: (->
id = @get('id')
builds = @store.filter('build', event_type: 'push', repository_id: id, (b) ->
b.get('repo.id') == id && b.get('eventType') == 'push'
builds = @store.filter('build', event_type: ['push', 'api'], repository_id: id, (b) ->
b.get('repo.id') == id && (b.get('eventType') == 'push' || b.get('eventType') == 'api')
)
# TODO: move to controller