diff --git a/app/models/build.coffee b/app/models/build.coffee index 27ff2c8d..39dcca4d 100644 --- a/app/models/build.coffee +++ b/app/models/build.coffee @@ -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') diff --git a/app/models/repo.coffee b/app/models/repo.coffee index f91d0a76..d150d46e 100644 --- a/app/models/repo.coffee +++ b/app/models/repo.coffee @@ -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