Merge branch 'stable-3.6' into stable-3.7
* stable-3.6:
Initialise the project name / change number eagerly in gr-router
Don't navigate on subsection change while reloading.
Release-Notes: skip
Change-Id: I584e5e6a34debfb6daacf878257eed0622c61eb4
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
index 0d8a080..1102895 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -345,6 +345,13 @@
}
setState(state: AppElementParams) {
+ if (
+ 'project' in state &&
+ state.project !== undefined &&
+ 'changeNum' in state
+ )
+ this.restApiService.setInProjectLookup(state.changeNum, state.project);
+
this.routerModel.setState({
view: state.view,
changeNum: 'changeNum' in state ? state.changeNum : undefined,