Updated Branches:
  refs/heads/trunk 62cd37677 -> 3f688723b

AMBARI-3196. Problems with service selection for 1.x stack. (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b4cb39a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b4cb39a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b4cb39a0

Branch: refs/heads/trunk
Commit: b4cb39a08455cf8d4b4c15543ae1996d41f1f1ce
Parents: 62cd376
Author: Oleg Nechiporenko <[email protected]>
Authored: Thu Sep 12 16:27:35 2013 +0300
Committer: Oleg Nechiporenko <[email protected]>
Committed: Thu Sep 12 16:58:32 2013 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step4_controller.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b4cb39a0/ambari-web/app/controllers/wizard/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js 
b/ambari-web/app/controllers/wizard/step4_controller.js
index 96653cc..4416ebd 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -55,11 +55,8 @@ App.WizardStep4Controller = Em.ArrayController.extend({
     var mapreduce2 = this.findProperty('serviceName', 'MAPREDUCE2');
 
     // prevent against getting error when not all elements have been loaded yet
-    if (hbase && zookeeper && hive && hcatalog && webhcat && yarn && 
mapreduce2) {
-      if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), 
"2.0") === -1) {
-        zookeeper.set('isSelected', hbase.get('isSelected') || 
hive.get('isSelected'));
-      }
-      else {
+    if (hbase && zookeeper && hive && hcatalog && webhcat) {
+      if (yarn && mapreduce2) {
         mapreduce2.set('isSelected', yarn.get('isSelected'));
       }
       hcatalog.set('isSelected', hive.get('isSelected'));

Reply via email to