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 2014/04/02 20:52:47 UTC
git commit: AMBARI-5310. Don't do server-client version match check
if App.version have not been set on ambari-web. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk d7605024e -> e849955ac
AMBARI-5310. Don't do server-client version match check if App.version have not been set on ambari-web. (xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e849955a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e849955a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e849955a
Branch: refs/heads/trunk
Commit: e849955ac5c127774c0a81a6e72a142f25852717
Parents: d760502
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Apr 2 11:52:25 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Apr 2 11:52:41 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/installer.js | 9 +++++++--
ambari-web/app/controllers/main.js | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e849955a/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index c5a422b..4d8e21e 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -319,9 +319,14 @@ App.InstallerController = App.WizardController.extend({
checkServerClientVersion: function () {
var dfd = $.Deferred();
var self = this;
- self.getServerVersion().done(function () {
+ if (App.get('version')) {
+ self.getServerVersion().done(function () {
+ dfd.resolve();
+ });
+ } else {
+ this.set('isServerClientVersionMismatch', false);
dfd.resolve();
- });
+ }
return dfd.promise();
},
getServerVersion: function(){
http://git-wip-us.apache.org/repos/asf/ambari/blob/e849955a/ambari-web/app/controllers/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main.js b/ambari-web/app/controllers/main.js
index a4ba054..b587ffd 100644
--- a/ambari-web/app/controllers/main.js
+++ b/ambari-web/app/controllers/main.js
@@ -127,9 +127,14 @@ App.MainController = Em.Controller.extend({
checkServerClientVersion: function () {
var dfd = $.Deferred();
var self = this;
- self.getServerVersion().done(function () {
+ if (App.get('version')) {
+ self.getServerVersion().done(function () {
+ dfd.resolve();
+ });
+ } else {
+ this.set('isServerClientVersionMismatch', false);
dfd.resolve();
- });
+ }
return dfd.promise();
},
getServerVersion: function(){