summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2021-05-21 09:21:32 +0200
committerDavid Ostrovsky <david@ostrovsky.org>2021-05-21 17:15:07 +0200
commit179df127e406e073d7f2e11a4e8df67656e3acfe (patch)
treec252f11c0754808d464731dd5ed4bab5e4725633
parent2abd14e762159b9580cac72c0d4a4b8f7eafa674 (diff)
gr-change-view: Skip loading mergeable if already known
The asynchronous mergeable call was added in: I01d03de9f2, and was partly reverted in major refactoring change: I01c87f6f6d7. The part to skip retrieval of mergeable attribute if already provided by changes detail endpoint was missed to be reverted. Bug: Issue 14577 Change-Id: I55e3f32761f0eb484c3b8c3799fd0a6568976017 (cherry picked from commit acb76bdfa491ba7141019c0b8b292e69638a6ab9)
-rw-r--r--polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js6
1 files changed, 6 insertions, 0 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 ddf28d4276..b0161287d3 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
@@ -1871,6 +1871,12 @@ class GrChangeView extends mixinBehaviors( [
return Promise.resolve();
}
+ // If mergeable bit was already returned in detail REST endpoint, use it.
+ if (this._change.mergeable !== undefined) {
+ this._mergeable = this._change.mergeable;
+ return Promise.resolve();
+ }
+
this._mergeable = null;
return this.$.restAPI.getMergeable(this._changeNum).then(m => {
this._mergeable = m.mergeable;