You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/09/10 20:07:31 UTC
git commit: AMBARI-7249. Slider View: On Create app wizard's
'Allocate Resources' page inputs are updated,
and changes are removed (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 3c9bb86cb -> a3724c69c
AMBARI-7249. Slider View: On Create app wizard's 'Allocate Resources' page inputs are updated, and changes are removed (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a3724c69
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3724c69
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3724c69
Branch: refs/heads/trunk
Commit: a3724c69ccf0533b20befeef330c389abb64dc3c
Parents: 3c9bb86
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Sep 10 20:37:57 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Sep 10 21:06:27 2014 +0300
----------------------------------------------------------------------
.../ui/app/controllers/createAppWizard/step2_controller.js | 3 ++-
.../slider/src/main/resources/ui/app/models/slider_app_type.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3724c69/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step2_controller.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step2_controller.js b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step2_controller.js
index c9e57ff..c1ff3fe 100644
--- a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step2_controller.js
+++ b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step2_controller.js
@@ -72,6 +72,7 @@ App.CreateAppWizardStep2Controller = Ember.ArrayController.extend({
initializeNewApp: function () {
var newApp = this.get('appWizardController.newApp');
this.set('newApp', newApp);
+ this.loadTypeComponents();
},
/**
@@ -94,7 +95,7 @@ App.CreateAppWizardStep2Controller = Ember.ArrayController.extend({
});
this.set('content', content);
}
- }.observes('newApp.appType.components.length'),
+ },
/**
* Check if param is integer
http://git-wip-us.apache.org/repos/asf/ambari/blob/a3724c69/contrib/views/slider/src/main/resources/ui/app/models/slider_app_type.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/models/slider_app_type.js b/contrib/views/slider/src/main/resources/ui/app/models/slider_app_type.js
index fd58384..d161037 100644
--- a/contrib/views/slider/src/main/resources/ui/app/models/slider_app_type.js
+++ b/contrib/views/slider/src/main/resources/ui/app/models/slider_app_type.js
@@ -31,7 +31,7 @@ App.SliderAppType = DS.Model.extend({
/**
* @type {App.SliderAppTypeComponent[]}
*/
- components: DS.hasMany('sliderAppTypeComponent', {async:true}),
+ components: DS.hasMany('sliderAppTypeComponent'),
/**
* @type {string}