You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/04/01 12:47:50 UTC
git commit: AMBARI-5295. Cannot proceed beyond Welcome page due to JS
error. (Denys Buzhor via akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b6064a746 -> 683753e25
AMBARI-5295. Cannot proceed beyond Welcome page due to JS error. (Denys Buzhor via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/683753e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/683753e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/683753e2
Branch: refs/heads/trunk
Commit: 683753e2520f2854fba71e609bf967ff1c98dd6d
Parents: b6064a7
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Apr 1 13:47:06 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Apr 1 13:47:06 2014 +0300
----------------------------------------------------------------------
ambari-web/app/config.js | 3 ++-
ambari-web/app/controllers/installer.js | 1 +
ambari-web/app/styles/application.less | 1 +
ambari-web/app/views/wizard/step1_view.js | 10 ++++++++++
4 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/683753e2/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index ba7884d..33b54c9 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -70,7 +70,8 @@ App.supports = {
deleteHost: true,
autoRollbackHA: false,
appTimelineServer: true,
- jobs: true
+ jobs: true,
+ ubuntu: true
};
if (App.enableExperimental) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/683753e2/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 51776e8..c5a422b 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -280,6 +280,7 @@ App.InstallerController = App.WizardController.extend({
if(repo.Repositories.repo_name == version.Versions.stack_name) {
var defaultBaseUrl = repo.Repositories.default_base_url || repo.Repositories.base_url;
var latestBaseUrl = repo.Repositories.latest_base_url || defaultBaseUrl;
+ if (!App.supports.ubuntu && os.OperatingSystems.os_type == 'ubuntu12') return; // @todo: remove after Ubuntu support confirmation
oses.push({
osType: os.OperatingSystems.os_type,
baseUrl: latestBaseUrl,
http://git-wip-us.apache.org/repos/asf/ambari/blob/683753e2/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index a011a17..537aa46 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5557,6 +5557,7 @@ i.icon-asterisks {
.os-td {
width: 17%;
padding: 2px;
+ vertical-align: middle;
}
.url {
width: 65%;
http://git-wip-us.apache.org/repos/asf/ambari/blob/683753e2/ambari-web/app/views/wizard/step1_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js
index 9eae51b..17211fb 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -150,6 +150,7 @@ App.WizardStep1View = Em.View.extend({
loadRepositories: function () {
var selectedStack = this.get('controller.content.stacks').findProperty('isSelected', true);
var reposGroup = [[],[],[]];
+ if (App.supports.ubuntu) reposGroup.push([]); // @todo: remove after Ubuntu support confirmation
var self = this;
if (selectedStack && selectedStack.operatingSystems) {
selectedStack.operatingSystems.forEach(function (os) {
@@ -195,6 +196,11 @@ App.WizardStep1View = Em.View.extend({
cur_repo.set('osType', 'SUSE 11');
reposGroup[2][1] = cur_repo;
break;
+ case 'ubuntu12':
+ cur_repo.set('osType','Ubuntu 12');
+ reposGroup[3][0] = cur_repo;
+ self.setGroupByOs(reposGroup[3], os, 3);
+ break;
}
});
}
@@ -344,6 +350,8 @@ App.WizardStep1View = Em.View.extend({
return ['redhat6', 'centos6', 'oraclelinux6'];
case 2:
return ['sles11', 'suse11'];
+ case 3:
+ return ['ubuntu12'];
}
return [];
},
@@ -366,6 +374,8 @@ App.WizardStep1View = Em.View.extend({
case 'sles11':
case 'suse11':
return 2;
+ case 'ubuntu12':
+ return 3;
}
return -1;
}