Repository: ambari Updated Branches: refs/heads/branch-2.4 1516dcd85 -> 4eb3c4f99
AMBARI-18032 UI:Warning message is not present and "Next button" is enabled when all HDP links is empty on Select Version page (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4eb3c4f9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4eb3c4f9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4eb3c4f9 Branch: refs/heads/branch-2.4 Commit: 4eb3c4f9916d339b13a769455b2151c65f7db9e3 Parents: 1516dcd Author: Zhe (Joe) Wang <[email protected]> Authored: Thu Aug 4 17:30:19 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Thu Aug 4 17:31:10 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/models/operating_system.js | 1 + ambari-web/app/views/wizard/step1_view.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4eb3c4f9/ambari-web/app/models/operating_system.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/operating_system.js b/ambari-web/app/models/operating_system.js index b137108..82cc91c 100644 --- a/ambari-web/app/models/operating_system.js +++ b/ambari-web/app/models/operating_system.js @@ -29,6 +29,7 @@ App.OperatingSystem = DS.Model.extend({ isSelected: DS.attr('boolean', {defaultValue: true}), isDeselected: Em.computed.not('isSelected'), + isNotFilled: Em.computed.someBy('repositories', 'isEmpty', true), isEmpty: Em.computed.everyBy('repositories', 'isEmpty', true) }); http://git-wip-us.apache.org/repos/asf/ambari/blob/4eb3c4f9/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 c3a5aac..2b80ad5 100644 --- a/ambari-web/app/views/wizard/step1_view.js +++ b/ambari-web/app/views/wizard/step1_view.js @@ -196,8 +196,8 @@ App.WizardStep1View = Em.View.extend({ } var operatingSystems = this.get('controller.selectedStack.operatingSystems'); var selectedOS = operatingSystems.filterProperty('isSelected', true); - return selectedOS.everyProperty('isEmpty', true); - }.property('[email protected]', '[email protected]', 'controller.selectedStack.useRedhatSatellite'), + return selectedOS.everyProperty('isNotFilled', true); + }.property('[email protected]', '[email protected]', 'controller.selectedStack.useRedhatSatellite'), popoverView: Em.View.extend({ tagName: 'i',
