You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/08/28 19:49:58 UTC
[23/45] git commit: AMBARI-7050. Installer incorrectly says Hive +
HCatalog + WebHCat needed. (jaimin)
AMBARI-7050. Installer incorrectly says Hive + HCatalog + WebHCat needed. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/39c7ae74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/39c7ae74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/39c7ae74
Branch: refs/heads/branch-alerts-dev
Commit: 39c7ae74bc9c1b3983a61c032f5c1ca745c9f48c
Parents: 51215cc
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Aug 27 16:49:33 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Aug 27 16:49:39 2014 -0700
----------------------------------------------------------------------
.../app/controllers/wizard/step4_controller.js | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/39c7ae74/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 92dbed4..d98a848 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -122,9 +122,9 @@ App.WizardStep4Controller = Em.ArrayController.extend({
*/
submit: function () {
if (!this.get('isSubmitDisabled')) {
+ this.setGroupedServices();
if (this.validate()) {
this.set('errorStack', []);
- this.setGroupedServices();
App.router.send('next');
}
}
@@ -258,15 +258,14 @@ App.WizardStep4Controller = Em.ArrayController.extend({
var missingDependencies = [];
var missingDependenciesDisplayName = [];
selectedServices.forEach(function(service){
-
- var dependentServices = service.get('requiredServices');
- if (!!dependentServices) {
- dependentServices.forEach(function(_dependentService){
- var dependentService = this.findProperty('serviceName', _dependentService);
- if (dependentService && dependentService.get('isSelected') === false) {
- if(missingDependencies.indexOf(_dependentService) == -1 ) {
- missingDependencies.push(_dependentService);
- missingDependenciesDisplayName.push(dependentService.get('displayNameOnSelectServicePage'));
+ var requiredServices = service.get('requiredServices');
+ if (!!requiredServices && requiredServices.length) {
+ requiredServices.forEach(function(_requiredService){
+ var requiredService = this.findProperty('serviceName', _requiredService);
+ if (requiredService && requiredService.get('isSelected') === false) {
+ if(missingDependencies.indexOf(_requiredService) == -1 ) {
+ missingDependencies.push(_requiredService);
+ missingDependenciesDisplayName.push(requiredService.get('displayNameOnSelectServicePage'));
}
}
},this);