Repository: ambari Updated Branches: refs/heads/trunk 7d7a6f7ab -> bb3b7525f
AMBARI-17468. Next button not enabled at Assign Slaves and Clients page (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb3b7525 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb3b7525 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb3b7525 Branch: refs/heads/trunk Commit: bb3b7525f4b73059d6d6fbc6655e61d8f54ea4b6 Parents: 7d7a6f7 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Tue Jun 28 11:58:25 2016 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Thu Jun 30 17:12:37 2016 -0700 ---------------------------------------------------------------------- .../stackadvisor/commands/ComponentLayoutValidationCommand.java | 3 +-- ambari-web/app/controllers/wizard/step6_controller.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bb3b7525/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java index 8ca53fe..310046f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java @@ -44,8 +44,7 @@ public class ComponentLayoutValidationCommand extends StackAdvisorCommand<Valida @Override protected void validate(StackAdvisorRequest request) throws StackAdvisorException { if (request.getHosts() == null || request.getHosts().isEmpty() || request.getServices() == null - || request.getServices().isEmpty() || request.getComponentHostsMap() == null - || request.getComponentHostsMap().isEmpty()) { + || request.getServices().isEmpty()) { throw new StackAdvisorException("Hosts, services and recommendations must not be empty"); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/bb3b7525/ambari-web/app/controllers/wizard/step6_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index e900f47..24b03f9 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -222,6 +222,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, { this.set('headers', []); this.clearError(); this.set('isLoaded', false); + this.set('validationInProgress', false); }, /**
