opendev/gerrit
Code Issues Proposed changes

Merge "Revert "Fix edit diff url"" into stable-3.0

Browse Source
This commit is contained in:
Tao Zhou
2020-05-19 09:11:09 +00:00
committed by Gerrit Code Review
parent c88cf9b2d7 bf05d23db8
commit 0c1b454290
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
View File

@@ -538,7 +538,8 @@
_goToEditFile() { _goToEditFile() {
// TODO(taoalpha): add a shortcut for editing // TODO(taoalpha): add a shortcut for editing
const editUrl = Gerrit.Nav.getEditUrlForDiff(this._change, this._path); const editUrl = Gerrit.Nav.getEditUrlForDiff(
this._change, this._path, this._patchRange.patchNum);
return Gerrit.Nav.navigateToRelativeUrl(editUrl); return Gerrit.Nav.navigateToRelativeUrl(editUrl);
}, },

3
polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.html
View File

@@ -378,7 +378,6 @@ limitations under the License.
}; };
element._change = { element._change = {
_number: 42, _number: 42,
project: 'gerrit',
status: 'NEW', status: 'NEW',
revisions: { revisions: {
a: {_number: 1, commit: {parents: []}}, a: {_number: 1, commit: {parents: []}},
@@ -392,8 +391,6 @@ limitations under the License.
assert.isTrue(!!editBtn); assert.isTrue(!!editBtn);
MockInteractions.tap(editBtn); MockInteractions.tap(editBtn);
assert.isTrue(redirectStub.called); assert.isTrue(redirectStub.called);
assert.isTrue(redirectStub.lastCall.calledWithExactly(
Gerrit.Nav.getEditUrlForDiff(element._change, element._path)));
done(); done();
}); });
}); });