opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Do not encode "," when redirecting /projects/ -> /repos/

Change-Id: Ia3463b508824c3f55310173ff8bb618f023cc23f
This commit is contained in:
Paladox
2019-07-09 17:34:52 +01:00
parent 0daeca60c3 58d0d0c690
commit 9c09a219c3
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
polygerrit-ui/app/elements/core/gr-router/gr-router.js
View File

@@ -1096,11 +1096,16 @@
},
_handleProjectsOldRoute(data) {
let params = '';
if (data.params[1]) {
this._redirect('/admin/repos/' + encodeURIComponent(data.params[1]));
} else {
this._redirect('/admin/repos');
params = encodeURIComponent(data.params[1]);
if (data.params[1].includes(',')) {
params =
encodeURIComponent(data.params[1]).replace('%2C', ',');
}
}
this._redirect(`/admin/repos/${params}`);
},
_handleRepoCommandsRoute(data) {

22
polygerrit-ui/app/elements/core/gr-router/gr-router_test.html
View File

@@ -1103,6 +1103,28 @@ limitations under the License.
});
suite('repo routes', () => {
test('_handleProjectsOldRoute', () => {
const data = {params: {}};
element._handleProjectsOldRoute(data);
assert.isTrue(redirectStub.calledOnce);
assert.equal(redirectStub.lastCall.args[0], '/admin/repos/');
});
test('_handleProjectsOldRoute test', () => {
const data = {params: {1: 'test'}};
element._handleProjectsOldRoute(data);
assert.isTrue(redirectStub.calledOnce);
assert.equal(redirectStub.lastCall.args[0], '/admin/repos/test');
});
test('_handleProjectsOldRoute test,branches', () => {
const data = {params: {1: 'test,branches'}};
element._handleProjectsOldRoute(data);
assert.isTrue(redirectStub.calledOnce);
assert.equal(
redirectStub.lastCall.args[0], '/admin/repos/test,branches');
});
test('_handleRepoRoute', () => {
const data = {params: {0: 4321}};
assertDataToParams(data, '_handleRepoRoute', {