Make sure that commit data is always fresh by using #with

Commit data in job and build view is sometimes unbound, make sure it's
refreshed when commit does change.
This commit is contained in:
Piotr Sarnacki 2013-05-15 17:20:46 +02:00
parent 985e218981
commit e21bee6494
2 changed files with 21 additions and 22 deletions

View File

@ -21,29 +21,29 @@
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd>
</div>
{{#if commit}}
{{#with build.commit}}
<div class="right">
<dt>{{t builds.commit}}</dt>
<dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit build.commit}}</a></dd>
<dd class="commit"><a {{bindAttr href="controller.urlGithubCommit"}}>{{formatCommit this}}</a></dd>
{{#if build.pullRequest}}
<dt>{{t builds.pull_request}}</dt>
<dd class="pull_request"><a {{bindAttr href="build.commit.compareUrl"}}>#{{build.pullRequestNumber}} {{build.pullRequestTitle}}</a></dd>
<dd class="pull_request"><a {{bindAttr href="compareUrl"}}>#{{build.pullRequestNumber}} {{build.pullRequestTitle}}</a></dd>
{{else}}
{{#if commit.compareUrl}}
{{#if compareUrl}}
<dt>{{t builds.compare}}</dt>
<dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom build.commit.compareUrl}}</a></dd>
<dd class="compare"><a {{bindAttr href="compareUrl"}}>{{pathFrom compareUrl}}</a></dd>
{{/if}}
{{/if}}
{{#if commit.authorName}}
{{#if authorName}}
<dt>{{t builds.author}}</dt>
<dd class="author"><a {{bindAttr href="urlAuthor"}}>{{build.commit.authorName}}</a></dd>
<dd class="author"><a {{bindAttr href="urlAuthor"}}>{{authorName}}</a></dd>
{{/if}}
{{#if commit.committerName}}
{{#if committerName}}
<dt>{{t builds.committer}}</dt>
<dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{build.commit.committerName}}</a></dd>
<dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{committerName}}</a></dd>
{{/if}}
</div>
{{/if}}
{{/with}}
<dt>{{t builds.message}}</dt>
<dd class="message">{{formatMessage build.commit.message}}</dd>

View File

@ -19,32 +19,31 @@
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration job.duration}}</dd>
</div>
{{#if commit}}
{{#with job.commit}}
<div class="right">
<dt>{{t jobs.commit}}</dt>
<dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit commit}}</a></dd>
<dd class="commit"><a {{bindAttr href="controller.urlGithubCommit"}}>{{formatCommit this}}</a></dd>
{{#if job.build.pullRequest}}
<dt>{{t builds.pull_request}}</dt>
<dd class="pull_request"><a {{bindAttr href="job.build.commit.compareUrl"}}>#{{job.build.pullRequestNumber}} {{job.build.pullRequestTitle}}</a></dd>
<dd class="pull_request"><a {{bindAttr href="compareUrl"}}>#{{job.build.pullRequestNumber}} {{job.build.pullRequestTitle}}</a></dd>
{{else}}
{{#if commit.compareUrl}}
{{#if compareUrl}}
<dt>{{t jobs.compare}}</dt>
<dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd>
<dd class="compare"><a {{bindAttr href="compareUrl"}}>{{pathFrom compareUrl}}</a></dd>
{{/if}}
{{/if}}
{{#if commit.authorName}}
{{#if authorName}}
<dt>{{t jobs.author}}</dt>
<dd class="author"><a {{bindAttr href="urlAuthor"}}>{{commit.authorName}}</a></dd>
<dd class="author"><a {{bindAttr href="controller.urlAuthor"}}>{{authorName}}</a></dd>
{{/if}}
{{#if commit.committerName}}
{{#if committerName}}
<dt>{{t jobs.committer}}</dt>
<dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{commit.committerName}}</a></dd>
<dd class="committer"><a {{bindAttr href="controller.urlCommitter"}}>{{committerName}}</a></dd>
{{/if}}
</div>
{{/if}}
{{/with}}
<dt>{{t jobs.message}}</dt>
<dd class="message">{{formatMessage commit.message}}</dd>
<dd class="message">{{formatMessage job.commit.message}}</dd>
<dt>{{t jobs.config}}</dt>
<dd class="config">{{formatConfig job.config}}</dd>
</dl>