From 92eb8436a1826d9f69446c321f5db465abf59230 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 11 Jun 2015 11:32:25 +0200 Subject: [PATCH] Revert "Revert "add eventType as an attribute, include api builds to the history"" This reverts commit 4d519f145a30fa6bce5ebf1c59a4fec3c90e79b8. --- app/models/build.coffee | 6 +----- app/models/repo.coffee | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/models/build.coffee b/app/models/build.coffee index 39dcca4d..27ff2c8d 100644 --- a/app/models/build.coffee +++ b/app/models/build.coffee @@ -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') diff --git a/app/models/repo.coffee b/app/models/repo.coffee index d150d46e..f91d0a76 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', 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