diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index 1f72af67..74d22d25 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -10,6 +10,8 @@ require 'travis/model' authorEmail: DS.attr('string') committerName: DS.attr('string') committerEmail: DS.attr('string') + pullRequestName: DS.attr('string') pullRequestNumber: DS.attr('number') + build: DS.belongsTo('Travis.Build', key: 'buildId') diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs index cda900f1..aa9565c8 100644 --- a/assets/scripts/app/templates/builds/list.hbs +++ b/assets/scripts/app/templates/builds/list.hbs @@ -3,18 +3,17 @@ {{t builds.name}} - {{t builds.message}} + {{#if view.isPullRequestsList}} + {{t builds.pr}} + {{else}} + {{t builds.message}} + {{/if}} {{t builds.commit}} {{t builds.commiter}} - {{#if view.isPullRequestsList}} - - {{t builds.pr}} - - {{/if}} {{t builds.duration}} {{t builds.finished_at}} @@ -31,9 +30,17 @@ {{/if}} - - {{{formatMessage commit.message short="true"}}} - + {{#if view.parentView.isPullRequestsList}} + + + #{{commit.pullRequestNumber}} - {{commit.pullRequestName}} + + + {{else}} + + {{{ formatMessage commit.message short="true"}}} + + {{/if}} {{formatCommit commit}} @@ -42,13 +49,6 @@ {{commit.committerName}} - {{#if commit.pullRequestNumber}} - - - #{{commit.pullRequestNumber}} - - - {{/if}} {{formatDuration duration}}