suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got pull request data being stored and displayed correctly

Browse Source
This commit is contained in:
Jason Smale 2013-03-18 10:36:31 +11:00
parent 63c461e86b
commit ed69690167
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
assets/scripts/app/models/build.coffee
View File

@ -1,18 +1,20 @@
require 'travis/model' require 'travis/model'
@Travis.Build = Travis.Model.extend Travis.DurationCalculations, @Travis.Build = Travis.Model.extend Travis.DurationCalculations,
eventType: DS.attr('string') eventType: DS.attr('string')
repoId: DS.attr('number') repoId: DS.attr('number')
commitId: DS.attr('number') commitId: DS.attr('number')
state: DS.attr('string') state: DS.attr('string')
number: DS.attr('number') number: DS.attr('number')
branch: DS.attr('string') branch: DS.attr('string')
message: DS.attr('string') message: DS.attr('string')
_duration: DS.attr('number') _duration: DS.attr('number')
_config: DS.attr('object') _config: DS.attr('object')
startedAt: DS.attr('string') startedAt: DS.attr('string')
finishedAt: DS.attr('string') finishedAt: DS.attr('string')
pullRequest: DS.attr('boolean')
pullRequestTitle: DS.attr('string')
repo: DS.belongsTo('Travis.Repo') repo: DS.belongsTo('Travis.Repo')
commit: DS.belongsTo('Travis.Commit') commit: DS.belongsTo('Travis.Commit')

1
assets/scripts/app/models/commit.coffee
View File

@ -10,7 +10,6 @@ require 'travis/model'
authorEmail: DS.attr('string') authorEmail: DS.attr('string')
committerName: DS.attr('string') committerName: DS.attr('string')
committerEmail: DS.attr('string') committerEmail: DS.attr('string')
pullRequestTitle: DS.attr('string')
pullRequestNumber: DS.attr('number') pullRequestNumber: DS.attr('number')
build: DS.belongsTo('Travis.Build') build: DS.belongsTo('Travis.Build')

4
assets/scripts/app/templates/builds/show.hbs
View File

@ -25,9 +25,9 @@
<div class="right"> <div class="right">
<dt>{{t builds.commit}}</dt> <dt>{{t builds.commit}}</dt>
<dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit build.commit}}</a></dd> <dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit build.commit}}</a></dd>
{{#if build.isPullRequest}} {{#if build.pullRequest}}
<dt>{{t builds.pullRequest}}</dt> <dt>{{t builds.pullRequest}}</dt>
<dd class="pull_request"><a {{bindAttr href="commit.compareUrl"}}>#{{build.commit.pullRequestNumber}} {{build.commit.pullRequestTitle}}</a></dd> <dd class="pull_request"><a {{bindAttr href="build.commit.compareUrl"}}>#{{build.commit.pullRequestNumber}} {{build.pullRequestTitle}}</a></dd>
{{else}} {{else}}
{{#if commit.compareUrl}} {{#if commit.compareUrl}}
<dt>{{t builds.compare}}</dt> <dt>{{t builds.compare}}</dt>