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

Revert "add eventType as an attribute, include api builds to the history"

Browse Source 
This reverts commit 5e1dd9a83b.
This commit is contained in:
Konstantin Haase 2015-05-12 12:35:41 +02:00
parent 93373e89ee
commit 4d519f145a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/build.coffee
View File

@ -17,7 +17,6 @@ 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)
@ -34,6 +33,11 @@ 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', 'api'], repository_id: id, (b) ->
b.get('repo.id') == id && (b.get('eventType') == 'push' || b.get('eventType') == 'api')
builds = @store.filter('build', event_type: 'push', repository_id: id, (b) ->
b.get('repo.id') == id && b.get('eventType') == 'push'
)
# TODO: move to controller