Selaa lähdekoodia

AMBARI-5295. Cannot proceed beyond Welcome page due to JS error. (Denys Buzhor via akovalenko)

Aleksandr Kovalenko 11 vuotta sitten
vanhempi
commit
683753e252

+ 2 - 1
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) {

+ 1 - 0
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,

+ 1 - 0
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%;

+ 10 - 0
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;
   }