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

Merge pull request #3383 from codyrancher/app-upgrade-version 

Use current template version for app upgrades
This commit is contained in:
Westly Wright 2019-09-25 09:53:41 -07:00 committed by GitHub
parent 2c7b865c63 8532a92c7e
commit e57b9526c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/catalog-tab/launch/route.js
View File

@ -152,6 +152,8 @@ export default Route.extend({
});
}
let catalogTemplateUrlKey = def;
if ( neuApp.id ) {
const v = get(neuApp, 'externalIdInfo.version');
const currentVersion = verArr.filter((ver) => ver.version === v);
@ -166,6 +168,7 @@ export default Route.extend({
currentVersion.forEach((ver) => {
set(ver, 'version', `${ ver.version } (current)`);
});
catalogTemplateUrlKey = v;
}
}
@ -177,7 +180,7 @@ export default Route.extend({
catalogTemplate,
namespace,
catalogApp: neuApp,
catalogTemplateUrl: links[def], // catalogTemplateUrl gets qp's added and this needs with out
catalogTemplateUrl: links[catalogTemplateUrlKey], // catalogTemplateUrl gets qp's added and this needs with out
namespaces: results.namespaces,
tpl: results.tpl,
tplKind: kind,