You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/01/16 11:47:56 UTC
git commit: AMBARI-4092 Need tooltip showing error why local repo is
bad 2.(ababiichuk)
Updated Branches:
refs/heads/trunk ad77a8afd -> 7a9385506
AMBARI-4092 Need tooltip showing error why local repo is bad 2.(ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a938550
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a938550
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a938550
Branch: refs/heads/trunk
Commit: 7a93855069126d4865bc9cccc5ddd9b42d3d68cd
Parents: ad77a8a
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Jan 16 12:44:02 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Jan 16 12:44:02 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/installer.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7a938550/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 0bf7e6b..fd693d9 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -374,6 +374,8 @@ App.InstallerController = App.WizardController.extend({
this.set('validationCnt', selectedStack.get('operatingSystems').filterProperty('selected', true).length);
this.set('invalidCnt', 0);
selectedStack.operatingSystems.forEach(function (os) {
+ os.errorTitle = null;
+ os.errorContent = null;
if (os.skipValidation) {
this.set('validationCnt', 0);
}
@@ -430,7 +432,7 @@ App.InstallerController = App.WizardController.extend({
var os = selectedStack.operatingSystems.findProperty('osType', osType);
os.validation = 'icon-exclamation-sign';
os.errorTitle = request.status + ":" + request.statusText;
- os.errorContent = $.parseJSON(request.responseText).message;
+ os.errorContent = $.parseJSON(request.responseText) ? $.parseJSON(request.responseText).message : "";
selectedStack.set('reload', !selectedStack.get('reload'));
this.set('validationCnt', this.get('validationCnt') - 1);
this.set('invalidCnt', this.get('invalidCnt') + 1);