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

Go to the right query params for sytem catalog entries (rancher/rancher#3923)

This commit is contained in:
Vincent Fiduccia 2016-03-22 14:07:39 -07:00
parent d97d52a1be
commit 6d200bcfa5
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/components/new-catalog/component.js
View File

@ -158,12 +158,16 @@ export default Ember.Component.extend(NewOrEdit, {
},
newExternalId: function() {
var systemCategories = C.EXTERNALID.SYSTEM_CATEGORIES.map((str) => { return str.trim().toLowerCase(); });
var category = (this.get('templateResource.category')||'').trim().toLowerCase();
var externalId = ( systemCategories.indexOf(category) >= 0 ? C.EXTERNALID.KIND_SYSTEM_CATALOG : C.EXTERNALID.KIND_CATALOG );
var externalId = ( this.get('isSystem') ? C.EXTERNALID.KIND_SYSTEM_CATALOG : C.EXTERNALID.KIND_CATALOG );
externalId += C.EXTERNALID.KIND_SEPARATOR + this.get('selectedTemplateModel.id');
return externalId;
}.property('templateResource.category','selectedTemplateModel.uuid'),
}.property('isSystem','selectedTemplateModel.id'),
isSystem: function() {
var systemCategories = C.EXTERNALID.SYSTEM_CATEGORIES.map((str) => { return str.trim().toLowerCase(); });
var category = (this.get('templateResource.category')||'').trim().toLowerCase();
return systemCategories.indexOf(category) >= 0;
}.property('templateResource.category'),
willSave() {
this.set('errors', null);
@ -223,9 +227,20 @@ export default Ember.Component.extend(NewOrEdit, {
var nsId = this.get('k8s.namespace.id');
return this.get('router').transitionTo('k8s-tab.namespace.services', projectId, nsId);
}
else if ( base === 'swarm' )
{
return this.get('router').transitionTo('applications-tab.compose-services', projectId);
}
else
{
return this.get('router').transitionTo('environment', projectId, this.get('primaryResource.id'));
if ( this.get('isSystem') )
{
return this.get('router').transitionTo('environment', projectId, this.get('primaryResource.id'), {queryParams: {which: 'system'}});
}
else
{
return this.get('router').transitionTo('environment', projectId, this.get('primaryResource.id'));
}
}
}