You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/04/29 00:16:47 UTC
git commit: AMBARI-5603. Ambari version is unknown during installer
via UI.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk eb0b6da82 -> 179e5b29b
AMBARI-5603. Ambari version is unknown during installer via UI.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/179e5b29
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/179e5b29
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/179e5b29
Branch: refs/heads/trunk
Commit: 179e5b29b4724fd810a55cbb36126bb866178d73
Parents: eb0b6da
Author: Xi Wang <xi...@apache.org>
Authored: Mon Apr 28 14:09:36 2014 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Mon Apr 28 15:15:58 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/application.js | 7 +++++--
.../app/controllers/global/cluster_controller.js | 2 --
ambari-web/app/controllers/installer.js | 18 +++++++++---------
ambari-web/app/controllers/main.js | 18 +++++++++---------
4 files changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/179e5b29/ambari-web/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js
index 0eea0cb..f82d9bd 100644
--- a/ambari-web/app/controllers/application.js
+++ b/ambari-web/app/controllers/application.js
@@ -27,9 +27,12 @@ App.ApplicationController = Em.Controller.extend(App.UserPref, {
return (App.router.get('clusterController.clusterName') || 'My Cluster');
}.property('App.router.clusterController.clusterName'),
+ /**
+ * set ambari server version from installerController or mainController, making sure version shown up all the time
+ */
ambariVersion: function () {
- return (App.router.get('clusterController.ambariVersion') || Em.I18n.t('common.notAvailable'));
- }.property('App.router.clusterController.ambariVersion'),
+ return (App.router.get('installerController.ambariServerVersion') || App.router.get('mainController.ambariServerVersion') || Em.I18n.t('common.notAvailable'));
+ }.property('App.router.installerController.ambariServerVersion', 'App.router.mainController.ambariServerVersion'),
clusterDisplayName: function () {
var name = this.get('clusterName');
http://git-wip-us.apache.org/repos/asf/ambari/blob/179e5b29/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index 657b7a1..ff988c9 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -23,7 +23,6 @@ App.ClusterController = Em.Controller.extend({
cluster: null,
isLoaded: false,
ambariProperties: null,
- ambariVersion: null,
ambariViews: [],
clusterDataLoadedPercent: 'width:0', // 0 to 1
/**
@@ -457,7 +456,6 @@ App.ClusterController = Em.Controller.extend({
loadAmbariPropertiesSuccess: function (data) {
console.log('loading ambari properties');
this.set('ambariProperties', data.RootServiceComponents.properties);
- this.set('ambariVersion', data.RootServiceComponents.component_version);
},
loadAmbariPropertiesError: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/179e5b29/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index bc9617d..48c501e 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -331,14 +331,9 @@ App.InstallerController = App.WizardController.extend({
checkServerClientVersion: function () {
var dfd = $.Deferred();
var self = this;
- if (App.get('version')) {
- self.getServerVersion().done(function () {
- dfd.resolve();
- });
- } else {
- this.set('isServerClientVersionMismatch', false);
+ self.getServerVersion().done(function () {
dfd.resolve();
- }
+ });
return dfd.promise();
},
getServerVersion: function(){
@@ -352,8 +347,13 @@ App.InstallerController = App.WizardController.extend({
getServerVersionSuccessCallback: function (data) {
var clientVersion = App.get('version');
var serverVersion = (data.RootServiceComponents.component_version).toString();
- this.set('versionConflictAlertBody', Em.I18n.t('app.versionMismatchAlert.body').format(serverVersion, clientVersion));
- this.set('isServerClientVersionMismatch', clientVersion != serverVersion);
+ this.set('ambariServerVersion', serverVersion);
+ if (clientVersion) {
+ this.set('versionConflictAlertBody', Em.I18n.t('app.versionMismatchAlert.body').format(serverVersion, clientVersion));
+ this.set('isServerClientVersionMismatch', clientVersion != serverVersion);
+ } else {
+ this.set('isServerClientVersionMismatch', false);
+ }
},
getServerVersionErrorCallback: function () {
console.log('ERROR: Cannot load Ambari server version');
http://git-wip-us.apache.org/repos/asf/ambari/blob/179e5b29/ambari-web/app/controllers/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main.js b/ambari-web/app/controllers/main.js
index b587ffd..f024f9f 100644
--- a/ambari-web/app/controllers/main.js
+++ b/ambari-web/app/controllers/main.js
@@ -127,14 +127,9 @@ App.MainController = Em.Controller.extend({
checkServerClientVersion: function () {
var dfd = $.Deferred();
var self = this;
- if (App.get('version')) {
- self.getServerVersion().done(function () {
- dfd.resolve();
- });
- } else {
- this.set('isServerClientVersionMismatch', false);
+ self.getServerVersion().done(function () {
dfd.resolve();
- }
+ });
return dfd.promise();
},
getServerVersion: function(){
@@ -148,8 +143,13 @@ App.MainController = Em.Controller.extend({
getServerVersionSuccessCallback: function (data) {
var clientVersion = App.get('version');
var serverVersion = (data.RootServiceComponents.component_version).toString();
- this.set('versionConflictAlertBody', Em.I18n.t('app.versionMismatchAlert.body').format(serverVersion, clientVersion));
- this.set('isServerClientVersionMismatch', clientVersion != serverVersion);
+ this.set('ambariServerVersion', serverVersion);
+ if (clientVersion) {
+ this.set('versionConflictAlertBody', Em.I18n.t('app.versionMismatchAlert.body').format(serverVersion, clientVersion));
+ this.set('isServerClientVersionMismatch', clientVersion != serverVersion);
+ } else {
+ this.set('isServerClientVersionMismatch', false);
+ }
},
getServerVersionErrorCallback: function () {
console.log('ERROR: Cannot load Ambari server version');