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

Bugs

This commit is contained in:
Vincent Fiduccia 2016-10-07 18:11:52 -07:00
parent e3cdd84157
commit a169212cd8
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/catalog.js
View File

@ -79,7 +79,7 @@ export default Ember.Service.extend({
filter(data, category, templateBase, plusInfra) { filter(data, category, templateBase, plusInfra) {
let bases = []; let bases = [];
category = category.toLowerCase(); category = (category||'all').toLowerCase();
if ( templateBase === 'cattle' ) { if ( templateBase === 'cattle' ) {
bases.push(''); bases.push('');

10
app/stacks/index/controller.js
View File

@ -4,13 +4,15 @@ import C from 'ui/utils/constants';
import { tagsToArray, normalizedChoices } from 'ui/models/stack'; import { tagsToArray, normalizedChoices } from 'ui/models/stack';
export default Ember.Controller.extend(Sortable, { export default Ember.Controller.extend(Sortable, {
stacks: Ember.inject.controller(), stacksController: Ember.inject.controller('stacks'),
projects: Ember.inject.service(), projects: Ember.inject.service(),
prefs: Ember.inject.service(), prefs: Ember.inject.service(),
intl: Ember.inject.service(), intl: Ember.inject.service(),
which: Ember.computed.alias('stacks.which'), stacks: Ember.computed.alias('stacksController.stacks'),
tags: Ember.computed.alias('stacks.tags'), infraTemplates: Ember.computed.alias('stacksController.infraTemplates'),
which: Ember.computed.alias('stacksController.which'),
tags: Ember.computed.alias('stacksController.tags'),
showAddtlInfo: false, showAddtlInfo: false,
selectedService: null, selectedService: null,
@ -103,7 +105,7 @@ export default Ember.Controller.extend(Sortable, {
filteredStacks: function() { filteredStacks: function() {
var which = this.get('which'); var which = this.get('which');
var needTags = tagsToArray(this.get('tags')); var needTags = tagsToArray(this.get('tags'));
var out = this.get('model'); var out = this.get('model.stacks');
if ( which !== C.EXTERNAL_ID.KIND_ALL ) if ( which !== C.EXTERNAL_ID.KIND_ALL )
{ {

6
app/stacks/route.js
View File

@ -3,9 +3,13 @@ import C from 'ui/utils/constants';
export default Ember.Route.extend({ export default Ember.Route.extend({
projects: Ember.inject.service(), projects: Ember.inject.service(),
catalog: Ember.inject.service(),
model: function() { 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*/) { resetController: function (controller/*, isExisting, transition*/) {