rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3547 from westlywright/k8s.version.switching.madness 

Handle Deprecated Transition Params
This commit is contained in:
Westly Wright 2019-11-05 16:35:54 -07:00 committed by GitHub
parent 9feeb23d6a 07c77cc41d
commit ae4237c537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/authenticated/cluster/edit/route.js
View File

@ -46,10 +46,13 @@ export default Route.extend({
if (clusterTemplateRevisionId) {
if (clusterTemplateRevisions) {
let ctr = null;
let ctr = null;
const { queryParams } = transition.to;
if (transition.queryParams && transition.queryParams.clusterTemplateRevision) {
clusterTemplateRevisionId = transition.queryParams.clusterTemplateRevision;
if (queryParams && queryParams.clusterTemplateRevision) {
clusterTemplateRevisionId = queryParams.clusterTemplateRevision;
set(cluster, 'clusterTemplateRevisionId', clusterTemplateRevisionId);
}
ctr = clusterTemplateRevisions.findBy('id', clusterTemplateRevisionId);

2
lib/global-admin/addon/clusters/new/launch/route.js
View File

@ -28,7 +28,7 @@ export default Route.extend({
}
if (clusterTemplateEnforcement) {
if (clusterTemplates.length === 1 && isEmpty(transition.queryParams.clusterTemplateRevision)) {
if (clusterTemplates.length === 1 && isEmpty(transition.to.params.clusterTemplateRevision)) {
return this.replaceWith(this.routeName, transition.to.params.provider, { queryParams: { clusterTemplateRevision: clusterTemplates.firstObject.defaultRevisionId } });
}
}