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-11-15 17:26:41 -07:00
parent 773ca36666
commit aaa792efdf
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/stack.js
View File

@ -18,7 +18,7 @@ export function activeIcon(stack)
} }
export function normalizeTag(name) { export function normalizeTag(name) {
return (name||'').replace(/[^a-z0-9_ -]/ig,''); return (name||'').trim().toLowerCase();
} }
export function tagsToArray(str) { export function tagsToArray(str) {

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

@ -1,7 +1,7 @@
import Ember from 'ember'; import Ember from 'ember';
import NewOrEdit from 'ui/mixins/new-or-edit'; import NewOrEdit from 'ui/mixins/new-or-edit';
import C from 'ui/utils/constants'; import C from 'ui/utils/constants';
import {tagChoices} from 'ui/models/stack'; import {tagChoices, tagsToArray} from 'ui/models/stack';
export default Ember.Controller.extend(NewOrEdit, { export default Ember.Controller.extend(NewOrEdit, {
queryParams: ['githubRepo','githubBranch','composeFiles','system'], queryParams: ['githubRepo','githubBranch','composeFiles','system'],
@ -19,6 +19,14 @@ export default Ember.Controller.extend(NewOrEdit, {
this.set('allStacks', this.get('store').all('stack')); this.set('allStacks', this.get('store').all('stack'));
}, },
actions: {
addTag(tag) {
let neu = tagsToArray(this.get('model.group'));
neu.addObject(tag);
this.set('model.group', neu.join(', '));
},
},
groupChoices: function() { groupChoices: function() {
return tagChoices(this.get('allStacks')); return tagChoices(this.get('allStacks'));
}.property('allStacks.@each.grouping'), }.property('allStacks.@each.grouping'),

2
app/stacks/new/template.hbs
View File

@ -42,7 +42,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each groupChoices as |key|}} {{#each groupChoices as |key|}}
<li><a {{action (mut primaryResource.group) key}}>{{key}}</a></li> <li><a {{action "addTag" key}}>{{key}}</a></li>
{{/each}} {{/each}}
</ul> </ul>
</div> </div>