From 90a1d10d269fc39727cff4afc31f5d81adb4e483 Mon Sep 17 00:00:00 2001 From: Jason Smale Date: Mon, 4 Mar 2013 11:00:44 +1100 Subject: [PATCH 1/4] Show the title of the PR, rather than message in the PR tab --- assets/scripts/app/models/commit.coffee | 2 ++ assets/scripts/app/templates/builds/list.hbs | 32 ++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) 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}} From 10209bbc269c08ecd2bf955a0318bd317e6db575 Mon Sep 17 00:00:00 2001 From: Jason Smale Date: Mon, 18 Mar 2013 09:14:28 +1100 Subject: [PATCH 2/4] Added structure, but pull request data not accessible in view --- assets/scripts/app/models/commit.coffee | 2 +- assets/scripts/app/templates/builds/show.hbs | 11 ++++++++--- locales/de.yml | 1 + locales/en.yml | 1 + locales/es.yml | 1 + locales/fr.yml | 1 + locales/ja.yml | 1 + locales/nb.yml | 1 + locales/nl.yml | 1 + locales/pl.yml | 1 + locales/pt-BR.yml | 1 + locales/ru.yml | 1 + 12 files changed, 19 insertions(+), 4 deletions(-) diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index 74d22d25..da1dc4e7 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -10,7 +10,7 @@ require 'travis/model' authorEmail: DS.attr('string') committerName: DS.attr('string') committerEmail: DS.attr('string') - pullRequestName: DS.attr('string') + pullRequestTitle: DS.attr('string') pullRequestNumber: DS.attr('number') diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 03c48b71..b43c996c 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -22,9 +22,14 @@
{{t builds.commit}}
{{formatCommit build.commit}}
- {{#if commit.compareUrl}} -
{{t builds.compare}}
-
{{pathFrom build.commit.compareUrl}}
+ {{#if build.isPullRequest}} +
{{t builds.pullRequest}}
+
#{{build.commit.pullRequestNumber}} {{build.commit.pullRequestTitle}}
+ {{else}} + {{#if commit.compareUrl}} +
{{t builds.compare}}
+
{{pathFrom build.commit.compareUrl}}
+ {{/if}} {{/if}} {{#if commit.authorName}}
{{t builds.author}}
diff --git a/locales/de.yml b/locales/de.yml index b4b87895..72a9084b 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -20,6 +20,7 @@ de: sponsored_by: Dieser Testablauf lief auf einem Arbeiter-Rechner gesponsert von name: pr: + pull_request: started_at: Läuft state: Status datetime: diff --git a/locales/en.yml b/locales/en.yml index d5ef97fd..cbed4261 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -20,6 +20,7 @@ en: sponsored_by: This test series was run on a worker box sponsored by name: Build pr: PR + pull_request: Pull Request started_at: Started state: State datetime: diff --git a/locales/es.yml b/locales/es.yml index ecd7d82c..c5e72383 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -20,6 +20,7 @@ es: sponsored_by: Esta serie de tests han sido ejecutados en una caja de Proceso patrocinada por name: Build pr: + pull_request: started_at: Iniciado state: datetime: diff --git a/locales/fr.yml b/locales/fr.yml index 9f7df4a6..37d1885d 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -20,6 +20,7 @@ fr: sponsored_by: Cette série de tests a été exécutée sur une machine sponsorisée par name: Version pr: + pull_request: started_at: Commencé state: datetime: diff --git a/locales/ja.yml b/locales/ja.yml index 43e589bf..d1a42d98 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -20,6 +20,7 @@ ja: sponsored_by: このテストは以下のスポンサーの協力で行いました。 name: ビルド pr: + pull_request: started_at: 開始時刻 state: datetime: diff --git a/locales/nb.yml b/locales/nb.yml index 8ad41830..a3bba0f1 100644 --- a/locales/nb.yml +++ b/locales/nb.yml @@ -20,6 +20,7 @@ nb: sponsored_by: Denne testen ble kjørt på en maskin sponset av name: Jobb pr: + pull_request: started_at: Startet state: datetime: diff --git a/locales/nl.yml b/locales/nl.yml index 81c263b3..99d864b7 100644 --- a/locales/nl.yml +++ b/locales/nl.yml @@ -20,6 +20,7 @@ nl: sponsored_by: Deze tests zijn gedraaid op een machine gesponsord door name: Bouw pr: + pull_request: started_at: Gestart state: datetime: diff --git a/locales/pl.yml b/locales/pl.yml index 2df987d1..9eec632a 100644 --- a/locales/pl.yml +++ b/locales/pl.yml @@ -20,6 +20,7 @@ pl: sponsored_by: Te testy zostały uruchomione na maszynie sponsorowanej przez name: Build pr: + pull_request: started_at: Rozpoczęto state: status datetime: diff --git a/locales/pt-BR.yml b/locales/pt-BR.yml index 2e2a1b0f..2d73b85e 100644 --- a/locales/pt-BR.yml +++ b/locales/pt-BR.yml @@ -20,6 +20,7 @@ pt-BR: sponsored_by: Esta série de testes foi executada em uma caixa de processos patrocinada por name: Build pr: + pull_request: started_at: Iniciou em state: datetime: diff --git a/locales/ru.yml b/locales/ru.yml index a05549a2..7b5bf873 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -20,6 +20,7 @@ ru: sponsored_by: Эта серия тестов была запущена на машине, спонсируемой name: Билд pr: PR + pull_request: started_at: Начало state: состояние datetime: From 275b160d7dadfd8febb63db05a41a68ae929d1a9 Mon Sep 17 00:00:00 2001 From: Jason Smale Date: Mon, 18 Mar 2013 09:35:45 +1100 Subject: [PATCH 3/4] 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 From ed69690167283eb718af533bce4a4f3b08265be9 Mon Sep 17 00:00:00 2001 From: Jason Smale Date: Mon, 18 Mar 2013 10:36:31 +1100 Subject: [PATCH 4/4] Got pull request data being stored and displayed correctly --- assets/scripts/app/models/build.coffee | 24 +++++++++++--------- assets/scripts/app/models/commit.coffee | 1 - assets/scripts/app/templates/builds/show.hbs | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 03b20781..a98c373e 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -1,18 +1,20 @@ require 'travis/model' @Travis.Build = Travis.Model.extend Travis.DurationCalculations, - eventType: DS.attr('string') - repoId: DS.attr('number') - commitId: DS.attr('number') + eventType: DS.attr('string') + repoId: DS.attr('number') + commitId: DS.attr('number') - state: DS.attr('string') - number: DS.attr('number') - branch: DS.attr('string') - message: DS.attr('string') - _duration: DS.attr('number') - _config: DS.attr('object') - startedAt: DS.attr('string') - finishedAt: DS.attr('string') + state: DS.attr('string') + number: DS.attr('number') + branch: DS.attr('string') + message: DS.attr('string') + _duration: DS.attr('number') + _config: DS.attr('object') + startedAt: DS.attr('string') + finishedAt: DS.attr('string') + pullRequest: DS.attr('boolean') + pullRequestTitle: DS.attr('string') repo: DS.belongsTo('Travis.Repo') commit: DS.belongsTo('Travis.Commit') diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index 9e3be52f..18602b5c 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -10,7 +10,6 @@ require 'travis/model' authorEmail: DS.attr('string') committerName: DS.attr('string') committerEmail: DS.attr('string') - pullRequestTitle: DS.attr('string') pullRequestNumber: DS.attr('number') build: DS.belongsTo('Travis.Build') diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 447999d3..8815869f 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -25,9 +25,9 @@
{{t builds.commit}}
{{formatCommit build.commit}}
- {{#if build.isPullRequest}} + {{#if build.pullRequest}}
{{t builds.pullRequest}}
-
#{{build.commit.pullRequestNumber}} {{build.commit.pullRequestTitle}}
+
#{{build.commit.pullRequestNumber}} {{build.pullRequestTitle}}
{{else}} {{#if commit.compareUrl}}
{{t builds.compare}}