You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/07/23 13:20:13 UTC
git commit: AMBARI-6571. "all/none" links affects already installed
services on "Select Services" step. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 415fac0de -> 3df148d05
AMBARI-6571. "all/none" links affects already installed services on "Select Services" step. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3df148d0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3df148d0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3df148d0
Branch: refs/heads/trunk
Commit: 3df148d059ccad5640865b56b4bafbf3d2686c2e
Parents: 415fac0
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Jul 23 14:18:24 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Jul 23 14:18:24 2014 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step4_controller.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3df148d0/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 1e88870..872962d 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -42,7 +42,9 @@ App.WizardStep4Controller = Em.ArrayController.extend({
* @type {bool}
*/
isAll: function () {
- return this.everyProperty('isSelected', true);
+ return this.filterProperty('isInstalled', false).
+ filterProperty('isHiddenOnSelectServicePage', false).
+ everyProperty('isSelected', true);
}.property('@each.isSelected'),
/**
@@ -50,7 +52,9 @@ App.WizardStep4Controller = Em.ArrayController.extend({
* @type {bool}
*/
isMinimum: function () {
- return this.everyProperty('isSelected', false);
+ return this.filterProperty('isInstalled', false).
+ filterProperty('isHiddenOnSelectServicePage', false).
+ everyProperty('isSelected', false);
}.property('@each.isSelected'),
/**
@@ -58,7 +62,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
* @method selectAll
*/
selectAll: function () {
- this.setEach('isSelected', true);
+ this.filterProperty('isInstalled', false).setEach('isSelected', true);
},
/**
@@ -66,7 +70,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
* @method selectMinimum
*/
selectMinimum: function () {
- this.setEach('isSelected', false);
+ this.filterProperty('isInstalled', false).setEach('isSelected', false);
},
/**