Reverted back to old Pull Request listing layout
This commit is contained in:
parent
10209bbc26
commit
275b160d7d
|
@ -13,5 +13,4 @@ require 'travis/model'
|
||||||
pullRequestTitle: DS.attr('string')
|
pullRequestTitle: DS.attr('string')
|
||||||
pullRequestNumber: DS.attr('number')
|
pullRequestNumber: DS.attr('number')
|
||||||
|
|
||||||
|
|
||||||
build: DS.belongsTo('Travis.Build', key: 'buildId')
|
build: DS.belongsTo('Travis.Build', key: 'buildId')
|
||||||
|
|
|
@ -3,17 +3,18 @@
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{t builds.name}}</th>
|
<th>{{t builds.name}}</th>
|
||||||
{{#if view.isPullRequestsList}}
|
|
||||||
<th>{{t builds.pr}}</th>
|
|
||||||
{{else}}
|
|
||||||
<th>{{t builds.message}}</th>
|
<th>{{t builds.message}}</th>
|
||||||
{{/if}}
|
|
||||||
<th>
|
<th>
|
||||||
{{t builds.commit}}
|
{{t builds.commit}}
|
||||||
</th>
|
</th>
|
||||||
<th class="committer">
|
<th class="committer">
|
||||||
{{t builds.commiter}}
|
{{t builds.commiter}}
|
||||||
</th>
|
</th>
|
||||||
|
{{#if view.isPullRequestsList}}
|
||||||
|
<th>
|
||||||
|
{{t builds.pr}}
|
||||||
|
</th>
|
||||||
|
{{/if}}
|
||||||
<th>{{t builds.duration}}</th>
|
<th>{{t builds.duration}}</th>
|
||||||
<th>{{t builds.finished_at}}</th>
|
<th>{{t builds.finished_at}}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -30,17 +31,9 @@
|
||||||
</a>
|
</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
{{#if view.parentView.isPullRequestsList}}
|
|
||||||
<td class="message">
|
<td class="message">
|
||||||
<a {{bindAttr href="view.urlGithubPullRequest"}}>
|
{{{formatMessage commit.message short="true"}}}
|
||||||
#{{commit.pullRequestNumber}} - {{commit.pullRequestName}}
|
|
||||||
</a>
|
|
||||||
</td>
|
</td>
|
||||||
{{else}}
|
|
||||||
<td class="message">
|
|
||||||
{{{ formatMessage commit.message short="true"}}}
|
|
||||||
</td>
|
|
||||||
{{/if}}
|
|
||||||
<td class="commit">
|
<td class="commit">
|
||||||
<a {{bindAttr href="view.urlGithubCommit"}}>
|
<a {{bindAttr href="view.urlGithubCommit"}}>
|
||||||
{{formatCommit commit}}
|
{{formatCommit commit}}
|
||||||
|
@ -49,6 +42,13 @@
|
||||||
<td class="committer">
|
<td class="committer">
|
||||||
{{commit.committerName}}
|
{{commit.committerName}}
|
||||||
</td>
|
</td>
|
||||||
|
{{#if commit.pullRequestNumber}}
|
||||||
|
<td>
|
||||||
|
<a {{bindAttr href="view.urlGithubPullRequest"}}>
|
||||||
|
#{{commit.pullRequestNumber}}
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
{{/if}}
|
||||||
<td class="duration" {{bindAttr title="duration"}}>
|
<td class="duration" {{bindAttr title="duration"}}>
|
||||||
{{formatDuration duration}}
|
{{formatDuration duration}}
|
||||||
</td>
|
</td>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user