Fix display of 'Strategy' (submit type) in change metadata Refactor of 'gr-change-view' into 'gr-change-metadata' in I7c89c064c broke this functionality. Strategy is now displayed for any open change independently of displayed revision since change metadata does not respect revision information. 'submit_type' is 'ChangeInfo' content anyway. Change-Id: Icce01f2f3278b0ece85cbc428bbe4518ac957f52
diff --git a/polygerrit-ui/app/elements/gr-change-metadata.html b/polygerrit-ui/app/elements/gr-change-metadata.html index 50256e2..81b580f 100644 --- a/polygerrit-ui/app/elements/gr-change-metadata.html +++ b/polygerrit-ui/app/elements/gr-change-metadata.html
@@ -100,9 +100,9 @@ <span class="title">Topic</span> <span class="value">[[change.topic]]</span> </section> - <section hidden$="[[_computeHideStrategy(_change)]]" hidden> + <section class="strategy" hidden$="[[_computeHideStrategy(change)]]" hidden> <span class="title">Strategy</span> - <span class="value">[[_computeStrategy(_change)]]</span> + <span class="value">[[_computeStrategy(change)]]</span> </section> <template is="dom-repeat" items="[[_computeLabelNames(change.labels)]]" as="labelName"> @@ -150,9 +150,7 @@ _computeHideStrategy: function(change) { var open = change.status == this.ChangeStatus.NEW || change.status == this.ChangeStatus.DRAFT; - var current = !this._patchNum || - change.revisions[change.current_revision]._number == this._patchNum; - return !(open && current); + return !open; }, _computeStrategy: function(change) {
diff --git a/polygerrit-ui/app/test/gr-change-metadata-test.html b/polygerrit-ui/app/test/gr-change-metadata-test.html index ff69546..e4ce22f 100644 --- a/polygerrit-ui/app/test/gr-change-metadata-test.html +++ b/polygerrit-ui/app/test/gr-change-metadata-test.html
@@ -49,5 +49,20 @@ 'Cherry Pick'); }); + test('show strategy for open change', function() { + element.change = {status: 'NEW', submit_type: 'CHERRY_PICK', labels: {}}; + flushAsynchronousOperations(); + var strategy = element.$$('.strategy'); + assert.ok(strategy); + assert.isFalse(strategy.hasAttribute('hidden')); + assert.equal(strategy.children[1].innerHTML, 'Cherry Pick'); + }); + + test('hide strategy for closed change', function() { + element.change = {status: 'MERGED', labels: {}}; + flushAsynchronousOperations(); + assert.isTrue(element.$$('.strategy').hasAttribute('hidden')); + }); + }); </script>