opendev/gerrit
Code Issues Proposed changes

Merge "Prevent 'merged as sadface'"

Browse Source
This commit is contained in:
David Pursehouse
2017-01-26 00:06:38 +00:00
committed by Gerrit Code Review
parent 5ec42df72b ce843969cd
commit 34b1469b9f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
View File

@@ -255,12 +255,14 @@ limitations under the License.
<a href$="[[_computeChangePermalink(_change._number)]]">[[_change._number]]</a><!-- <a href$="[[_computeChangePermalink(_change._number)]]">[[_change._number]]</a><!--
--><template is="dom-if" if="[[_changeStatus]]"> --><template is="dom-if" if="[[_changeStatus]]">
([[_changeStatus]]<!-- ([[_changeStatus]]<!--
--><template is="dom-if" if="[[_computeShowCommitInfo(_changeStatus)]]"> --><template
is="dom-if"
if="[[_computeShowCommitInfo(_changeStatus, _change.current_revision)]]">
as as
<gr-commit-info <gr-commit-info
change="[[_change]]" change="[[_change]]"
commit-info="[[_computeMergedCommitInfo(_change.current_revision, _change.revisions)]]" commit-info="[[_computeMergedCommitInfo(_change.current_revision, _change.revisions)]]"
server-config="[[serverConfig]]"></gr-commit-info><!-- server-config="[[serverConfig]]"></gr-commit-info><!--
--></template><!-- --></template><!--
-->)<!-- -->)<!--
--></template><!-- --></template><!--

4
polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
View File

@@ -563,8 +563,8 @@
return statusString || ''; return statusString || '';
}, },
_computeShowCommitInfo: function(changeStatus) { _computeShowCommitInfo: function(changeStatus, current_revision) {
return changeStatus === 'Merged'; return changeStatus === 'Merged' && current_revision;
}, },
_computeMergedCommitInfo: function(current_revision, revisions) { _computeMergedCommitInfo: function(current_revision, revisions) {