Fix preserved state when returning to add container

This commit is contained in:
Vincent Fiduccia 2015-03-26 09:28:32 -07:00
parent 060012a4a7
commit 6134311ee7
3 changed files with 13 additions and 5 deletions

View File

@ -124,6 +124,7 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
},
initFields: function() {
this.set('error',null);
this.initNetwork();
this.initEnvironment();
this.initPorts();
@ -138,11 +139,16 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
this.userImageUuidDidChange();
this.terminalDidChange();
this.restartDidChange();
this.send('chooseRegistry', this.get('selectedRegistry'));
this.updateImageUuid();
this.set('restartLimit', 5);
this.set('restart', 'no'); // This has to come after restartLimit because changing the limit sets restart.
this.set('terminal', 'both');
},
// Restart
restart: 'no',
restartLimit: 5,
restart: null, //'no',
restartLimit: null, //5,
restartDidChange: function() {
var policy = {};
@ -250,7 +256,8 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
// Image
registryChoices: null,
displayPrefix: 'docker:',
selectedRegistry: null,
displayPrefix: '',
userImageUuid: 'ubuntu:14.04.1',
credentialChoices: null,
showCredential: Ember.computed.gt('credentialChoices.length',0),
@ -441,7 +448,7 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
}.observes('memoryMb'),
// Terminal
terminal: 'both',
terminal: null, //'both',
terminalDidChange: function() {
var val = this.get('terminal');
var stdinOpen = ( val === 'interactive' || val === 'both' );

View File

@ -81,6 +81,7 @@ export default Ember.Route.extend({
if (isExiting)
{
controller.set('tab', 'command');
controller.set('advanced', false);
}
}
});

View File

@ -1,6 +1,6 @@
{
"name": "ui",
"version": "0.13.0",
"version": "0.13.1",
"private": true,
"directories": {
"doc": "doc",