commit bb3fec321c98788aa5c5bc22148e950314f5c601
author Luca Milanesio <luca.milanesio@gmail.com> Thu Jul 08 22:49:15 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 08 22:49:15 2021 +0000
tree 2c87ca4f6e8023498cb7bda0e21bc97644f0f0cd
parent e2a2f471633d56cd36560fdf12e37677df878dec
parent 23c8a0d8badf0ab93da4e1750efe06a51dbc8858

Merge "Merge branch 'stable-3.2' into stable-3.3" into stable-3.3

polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts

diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
index a36e63d..047a818 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
@@ -238,16 +238,8 @@
   }
 
   _viewEditInChangeView() {
-    const patch = this._successfulSave
-      ? (SPECIAL_PATCH_SET_NUM.EDIT as PatchSetNum)
-      : this._patchNum;
-    if (this._change && patch)
-      GerritNav.navigateToChange(
-        this._change,
-        patch,
-        undefined,
-        patch !== SPECIAL_PATCH_SET_NUM.EDIT
-      );
+    if (this._change)
+      GerritNav.navigateToChange(this._change, undefined, undefined, true);
   }
 
   _getFileData(

polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js

diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
index b04277e..c0f615d 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
@@ -320,19 +320,14 @@
     element._showAlert('test message');
   });
 
-  test('_viewEditInChangeView respects _patchNum', () => {
+  test('_viewEditInChangeView', () => {
     element._change = {};
     navigateStub.restore();
     const navStub = sinon.stub(GerritNav, 'navigateToChange');
     element._patchNum = SPECIAL_PATCH_SET_NUM.EDIT;
     element._viewEditInChangeView();
-    assert.equal(navStub.lastCall.args[1], SPECIAL_PATCH_SET_NUM.EDIT);
-    element._patchNum = '1';
-    element._viewEditInChangeView();
-    assert.equal(navStub.lastCall.args[1], '1');
-    element._successfulSave = true;
-    element._viewEditInChangeView();
-    assert.equal(navStub.lastCall.args[1], SPECIAL_PATCH_SET_NUM.EDIT);
+    assert.equal(navStub.lastCall.args[1], undefined);
+    assert.equal(navStub.lastCall.args[3], true);
   });
 
   suite('keyboard shortcuts', () => {