mirror of https://github.com/rancher/ui.git
Bugs
This commit is contained in:
parent
e3cdd84157
commit
a169212cd8
|
|
@ -79,7 +79,7 @@ export default Ember.Service.extend({
|
|||
filter(data, category, templateBase, plusInfra) {
|
||||
let bases = [];
|
||||
|
||||
category = category.toLowerCase();
|
||||
category = (category||'all').toLowerCase();
|
||||
|
||||
if ( templateBase === 'cattle' ) {
|
||||
bases.push('');
|
||||
|
|
|
|||
|
|
@ -4,13 +4,15 @@ import C from 'ui/utils/constants';
|
|||
import { tagsToArray, normalizedChoices } from 'ui/models/stack';
|
||||
|
||||
export default Ember.Controller.extend(Sortable, {
|
||||
stacks: Ember.inject.controller(),
|
||||
stacksController: Ember.inject.controller('stacks'),
|
||||
projects: Ember.inject.service(),
|
||||
prefs: Ember.inject.service(),
|
||||
intl: Ember.inject.service(),
|
||||
|
||||
which: Ember.computed.alias('stacks.which'),
|
||||
tags: Ember.computed.alias('stacks.tags'),
|
||||
stacks: Ember.computed.alias('stacksController.stacks'),
|
||||
infraTemplates: Ember.computed.alias('stacksController.infraTemplates'),
|
||||
which: Ember.computed.alias('stacksController.which'),
|
||||
tags: Ember.computed.alias('stacksController.tags'),
|
||||
showAddtlInfo: false,
|
||||
selectedService: null,
|
||||
|
||||
|
|
@ -103,7 +105,7 @@ export default Ember.Controller.extend(Sortable, {
|
|||
filteredStacks: function() {
|
||||
var which = this.get('which');
|
||||
var needTags = tagsToArray(this.get('tags'));
|
||||
var out = this.get('model');
|
||||
var out = this.get('model.stacks');
|
||||
|
||||
if ( which !== C.EXTERNAL_ID.KIND_ALL )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,9 +3,13 @@ import C from 'ui/utils/constants';
|
|||
|
||||
export default Ember.Route.extend({
|
||||
projects: Ember.inject.service(),
|
||||
catalog: Ember.inject.service(),
|
||||
|
||||
model: function() {
|
||||
return this.get('store').findAll('stack');
|
||||
return Ember.RSVP.hash({
|
||||
stacks: this.get('store').findAll('stack'),
|
||||
infraTemplates: this.get('catalog').fetchTemplates({plusInfra: true, allowFailure: true}),
|
||||
});
|
||||
},
|
||||
|
||||
resetController: function (controller/*, isExisting, transition*/) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue