summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaladox <thomasmulhall410@yahoo.com>2021-07-16 23:19:06 +0100
committerPaladox none <thomasmulhall410@yahoo.com>2021-07-16 23:40:25 +0000
commit0fa4d3555a2eaeaa93b5c7bc6b0eb3d36d6ea161 (patch)
tree5243dcbc700622e5cb7e0719beaa46015ce99698
parent007fad573e8e74719d256c3c1bebd55662e9b739 (diff)
Revert "Fix wrong edit url being used within gr-file-list-header"
This reverts commit 970899e0e7c05f3c71040241786270b9d83ec8fc. This broke it for when a change edit existed on a merged change. And also broke selecting a edit patchset in the selector. Change-Id: Ib1abd1d97bb24f8d4824bf7e5e70d81626fea3fd
-rw-r--r--polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js4
-rw-r--r--polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html28
2 files changed, 0 insertions, 32 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js
index 9c8551c88f..73c6721506 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.js
@@ -242,10 +242,6 @@ class GrFileListHeader extends mixinBehaviors( [
const {basePatchNum, patchNum} = e.detail;
if (this.patchNumEquals(basePatchNum, this.basePatchNum) &&
this.patchNumEquals(patchNum, this.patchNum)) { return; }
- if (patchNum === 'edit' && basePatchNum === 'PARENT') {
- GerritNav.navigateToChange(this.change, undefined, undefined, true);
- return;
- }
GerritNav.navigateToChange(this.change, patchNum, basePatchNum);
}
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html
index 91705e788d..19362d5ab2 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header_test.html
@@ -261,34 +261,6 @@ suite('gr-file-list-header tests', () => {
.calledWithExactly(element.change, 3, 1));
});
- test('navigateToChange called when range select changes with edit', () => {
- const navigateToChangeStub = sinon.stub(GerritNav, 'navigateToChange');
- element.change = {
- change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
- revisions: {
- rev2: {_number: 2},
- rev1: {_number: 1},
- rev13: {_number: 13},
- rev3: {_number: 3},
- },
- status: 'NEW',
- labels: {},
- };
- element.basePatchNum = 1;
- element.patchNum = 'edit';
-
- const detail = {
- detail: {
- basePatchNum: 'PARENT',
- patchNum: 'edit',
- },
- };
- element._handlePatchChange(detail);
- assert.equal(navigateToChangeStub.callCount, 1);
- assert.isTrue(navigateToChangeStub.lastCall
- .calledWithExactly(element.change, undefined, undefined, true));
- });
-
test('class is applied to file list on old patch set', () => {
const allPatchSets = [{num: 4}, {num: 2}, {num: 1}];
assert.equal(element._computePatchInfoClass('1', allPatchSets),