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

Merge pull request #859 from vincent99/master 

more bugs
This commit is contained in:
Vincent Fiduccia 2016-10-10 18:09:50 -07:00 committed by GitHub
parent 5c9772616c 3fc15100bb
commit 9ea2f7db78
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/edit-stack/component.js
View File

@ -12,10 +12,6 @@ export default ModalBase.extend(NewOrEdit, {
actions: { actions: {
outsideClick() {}, outsideClick() {},
cancel() {
this.sendAction('dismiss');
},
addTag(tag) { addTag(tag) {
let neu = tagsToArray(this.get('primaryResource.group')); let neu = tagsToArray(this.get('primaryResource.group'));
neu.addObject(tag); neu.addObject(tag);

4
app/models/host.js
View File

@ -64,11 +64,11 @@ var Host = Resource.extend({
out.push({ label: 'action.machineConfig', icon: 'icon icon-download', action: 'machineConfig', enabled: true}); out.push({ label: 'action.machineConfig', icon: 'icon icon-download', action: 'machineConfig', enabled: true});
} }
out.push({ label: 'action.clone', icon: 'icon icon-copy', action: 'clone', enabled: true }); out.push({ label: 'action.clone', icon: 'icon icon-copy', action: 'clone', enabled: !!this.get('driver') });
out.push({ label: 'action.edit', icon: 'icon icon-edit', action: 'edit', enabled: !!a.update }); out.push({ label: 'action.edit', icon: 'icon icon-edit', action: 'edit', enabled: !!a.update });
return out; return out;
}.property('actionLinks.{activate,deactivate,remove,purge,update}','links.config'), }.property('actionLinks.{activate,deactivate,remove,purge,update}','links.config','driver'),
displayIp: Ember.computed.alias('agentIpAddress'), displayIp: Ember.computed.alias('agentIpAddress'),

2
translations/pt-br.yaml
View File

@ -1,5 +1,5 @@
--- ---
languageName: Português (BR) languageName: Português
generic: generic:
actions: Ações actions: Ações
closeModal: Fechar closeModal: Fechar