From 275b160d7dadfd8febb63db05a41a68ae929d1a9 Mon Sep 17 00:00:00 2001 From: Jason Smale Date: Mon, 18 Mar 2013 09:35:45 +1100 Subject: [PATCH] Reverted back to old Pull Request listing layout --- assets/scripts/app/models/commit.coffee | 1 - assets/scripts/app/templates/builds/list.hbs | 34 ++++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index da1dc4e7..467d5006 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -13,5 +13,4 @@ require 'travis/model' pullRequestTitle: 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 aa9565c8..6dcdcd4f 100644 --- a/assets/scripts/app/templates/builds/list.hbs +++ b/assets/scripts/app/templates/builds/list.hbs @@ -3,17 +3,18 @@ {{t builds.name}} - {{#if view.isPullRequestsList}} - {{t builds.pr}} - {{else}} - {{t builds.message}} - {{/if}} + {{t builds.message}} {{t builds.commit}} {{t builds.commiter}} + {{#if view.isPullRequestsList}} + + {{t builds.pr}} + + {{/if}} {{t builds.duration}} {{t builds.finished_at}} @@ -30,17 +31,9 @@ {{/if}} - {{#if view.parentView.isPullRequestsList}} - - - #{{commit.pullRequestNumber}} - {{commit.pullRequestName}} - - - {{else}} - - {{{ formatMessage commit.message short="true"}}} - - {{/if}} + + {{{formatMessage commit.message short="true"}}} + {{formatCommit commit}} @@ -49,6 +42,13 @@ {{commit.committerName}} + {{#if commit.pullRequestNumber}} + + + #{{commit.pullRequestNumber}} + + + {{/if}} {{formatDuration duration}} @@ -64,4 +64,4 @@

{{else}}
Loading
-{{/if}} +{{/if}} \ No newline at end of file