diff options
Diffstat (limited to 'polygerrit-ui/app/elements/change')
3 files changed, 10 insertions, 1 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js index 02cf861afa..4532a04a5d 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js @@ -1532,7 +1532,10 @@ // changes are obviously not mergeable, but the mergeability API will not // answer for abandoned changes. if (this._change.status === this.ChangeStatus.MERGED || - this._change.status === this.ChangeStatus.ABANDONED) { + this._change.status === this.ChangeStatus.STAGED || + this._change.status === this.ChangeStatus.INTEGRATING || + this._change.status === this.ChangeStatus.ABANDONED || + this._change.status === this.ChangeStatus.DEFERRED) { this._mergeable = false; return Promise.resolve(); } diff --git a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html index c607a9f899..75409951c6 100644 --- a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html +++ b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html @@ -38,6 +38,7 @@ limitations under the License. } </style> <template is="dom-repeat" items="[[_labels]]" as="label"> + <gr-endpoint-decorator name$="[[_computeDecoratorName('review-label-scores-', label.name)]]"> <gr-label-score-row class$="[[_computeLabelAccessClass(label.name, permittedLabels)]]" label="[[label]]" @@ -45,6 +46,7 @@ limitations under the License. labels="[[change.labels]]" permitted-labels="[[permittedLabels]]" label-values="[[_labelValues]]"></gr-label-score-row> + </gr-endpoint-decorator> </template> <div class="mergedMessage" hidden$="[[!_changeIsMerged(change.status)]]"> diff --git a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js index dffba3e60d..912ccae080 100644 --- a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js +++ b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js @@ -82,6 +82,10 @@ return null; }, + _computeDecoratorName(preString, name) { + return preString + name.toLowerCase(); + }, + _computeLabels(labelRecord, account) { // Polymer 2: check for undefined if ([labelRecord, account].some(arg => arg === undefined)) { |