You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/12/09 16:23:07 UTC
svn commit: r1419009 [4/4] - in
/incubator/ambari/branches/AMBARI-666/ambari-web/app: ./ assets/data/apps/
assets/data/wizard/bootstrap/ assets/img/ controllers/ controllers/global/
controllers/main/host/ controllers/main/service/ controllers/wizard/ d...
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js?rev=1419009&r1=1419008&r2=1419009&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step2_view.js Sun Dec 9 15:23:01 2012
@@ -32,7 +32,7 @@ App.SshKeyFileUploader = Ember.View.exte
return function(e) {
$('#sshKey').html(e.target.result);
//$('.sshKey-file-view').html(e.target.result);
- self.set("controller.content.sshKey", e.target.result);
+ self.set("controller.content.hosts.sshKey", e.target.result);
};
})(file);
reader.readAsText(file);
@@ -62,8 +62,8 @@ App.WizardStep2View = Em.View.extend({
}.observes('controller.hostNameEmptyError', 'controller.hostNameNotRequiredErr', 'controller.hostNameErr'),
sshKeyState: function(){
- return this.get("controller").get("content.manualInstall");
- }.property("controller.content.manualInstall"),
+ return this.get("controller.content.hosts.manualInstall");
+ }.property("controller.content.hosts.manualInstall"),
sshKeyClass:function() {
//alert(this.get("isFileApi"))
@@ -75,8 +75,8 @@ App.WizardStep2View = Em.View.extend({
}.property(),
sshKeyPreviewClass: function() {
- if (this.get('controller.content.sshKey').trim() != '') {
- if (this.get('controller.content.manualInstall')) {
+ if (this.get('controller.content.hosts.sshKey').trim() != '') {
+ if (this.get('controller.content.hosts.manualInstall')) {
return 'sshKey-file-view disabled';
} else {
return 'sshKey-file-view';
@@ -84,7 +84,7 @@ App.WizardStep2View = Em.View.extend({
} else {
return 'hidden';
}
- }.property('controller.content.sshKey', 'controller.content.manualInstall')
+ }.property('controller.content.hosts.sshKey', 'controller.content.hosts.manualInstall')
});
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js?rev=1419009&r1=1419008&r2=1419009&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js Sun Dec 9 15:23:01 2012
@@ -198,7 +198,7 @@ App.HostStatusView = Em.View.extend({
return roleArr;
}.property('startedTasks.@each'),
- didInsertElement: function () {debugger;
+ didInsertElement: function () {
console.log('The value of event context is: ' + host.name);
this.get('roles').forEach(function (role) {
role.taskInfos.forEach(function (task) {