rtyler
/
blueocean-plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #79 from cloudbees/feature/UX-199 

[feature/UX-199] Empty cells should contain em dash
This commit is contained in:
Thorsten Scherler 2016-03-21 21:01:26 +01:00
parent e392c367cf f72eed5004
commit 3f5bd736dd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blueocean-admin/src/main/js/components/Branches.jsx
View File

@ -48,8 +48,8 @@ export class Branche extends Component {
<td><WeatherIcon score={pipeline.weatherScore} /></td>
<td>{latestRun.result}</td>
<td>{decodeURIComponent(branch)}</td>
<td>{idCommit}</td>
<td>{msgCommit}</td>
<td>{idCommit || '-'}</td>
<td>{msgCommit || '-'}</td>
<td>{moment(latestRun.endTime).fromNow()}</td>
</tr>);
}

2
blueocean-admin/src/main/js/components/Pipeline.jsx
View File

@ -33,7 +33,7 @@ export default class Pipeline extends Component {
| {numberOfFailingPullRequests} failing
</td>);
} else {
multiBranch = multiPr = (<td></td>);
multiBranch = multiPr = (<td> - </td>);
}
return (<tr key={name}>

4
blueocean-admin/src/main/js/components/PullRequest.jsx
View File

@ -15,8 +15,8 @@ export default class PullRequest extends Component {
return (<tr key={latestRun.id}>
<td>{latestRun.result}</td>
<td>{latestRun.id}</td>
<td>{pullRequest.title}</td>
<td>{pullRequest.author}</td>
<td>{pullRequest.title || '-'}</td>
<td>{pullRequest.author || '-'}</td>
<td>{moment(latestRun.endTime).fromNow()}</td>
</tr>);
}

4
blueocean-admin/src/main/js/components/Runs.jsx
View File

@ -26,9 +26,9 @@ export default class Runs extends Component {
return (<tr key={data.id}>
<td>{data.result}</td>
<td>{data.id}</td>
<td>{changeset && changeset.commitId && changeset.commitId.substring(0, 8)}</td>
<td>{changeset && changeset.commitId && changeset.commitId.substring(0, 8) || '-'}</td>
<td>{decodeURIComponent(data.pipeline)}</td>
<td>{changeset && changeset.comment}</td>
<td>{changeset && changeset.comment || '-'}</td>
<td>
{duration} minutes
</td>

2
blueocean-admin/src/test/js/pipeline-spec.js
View File

@ -57,7 +57,7 @@ describe("pipeline component simple rendering", () => {
// simple element has no children
assert.equal(children[2].type, 'td');
assert.isObject(children[2].props);
assert.isUndefined(children[2].props.children);
assert.equal(children[2].props.children, ' - ');
});
});