You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/06/04 15:35:38 UTC
ambari git commit: AMBARI-11683 RU: Configs merge check popup is
displayed even if there are no conflict. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f1625d780 -> b3ed80611
AMBARI-11683 RU: Configs merge check popup is displayed even if there are no conflict. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3ed8061
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3ed8061
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3ed8061
Branch: refs/heads/trunk
Commit: b3ed8061144d6bf5c35b68e4ab9e6ccd141b7884
Parents: f1625d7
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Jun 4 15:53:42 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Jun 4 16:35:04 2015 +0300
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 4 ++--
.../admin/stack_and_upgrade_controller_test.js | 17 ++++++++++++++++-
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ed8061/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 223685b..3bdd317 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -459,9 +459,9 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
var title = Em.I18n.t('popup.clusterCheck.Upgrade.title');
var alert = Em.I18n.t('popup.clusterCheck.Upgrade.alert');
App.showClusterCheckPopup(data, header, title, alert);
- } else if (data.items.someProperty('UpgradeChecks.status', "WARNING") && data.items.someProperty('UpgradeChecks.id', "CONFIG_MERGE")) {
+ } else if (data.items.someProperty('UpgradeChecks.id', "CONFIG_MERGE") && Em.get(data.items.findProperty('UpgradeChecks.id', "CONFIG_MERGE"), 'UpgradeChecks.status') == 'WARNING') {
var self = this,
- configsMergeCheckData = data.items.findProperty('UpgradeChecks.id', "CONFIG_MERGE").UpgradeChecks.failed_detail;
+ configsMergeCheckData = Em.get(data.items.findProperty('UpgradeChecks.id', "CONFIG_MERGE"), 'UpgradeChecks.failed_detail');
this.set('requestInProgress', false);
App.showUpgradeConfigsMergePopup(configsMergeCheckData, params.label, function () {
self.upgrade(params);
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ed8061/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 7041a38..b8b4fe3 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -279,7 +279,22 @@ describe('App.MainAdminStackAndUpgradeController', function() {
showClusterCheckPopupCalledCount: 0,
showUpgradeConfigsMergePopupCalledCount: 1,
upgradeCalledCount: 0,
- title: 'warnings popup is displayed is configs merge conflicts are present'
+ title: 'warnings popup is displayed if configs merge conflicts are present'
+ },
+ {
+ check: {
+ "check": "Configuration Merge Check",
+ "status": "PASS",
+ "reason": "",
+ "failed_on": [],
+ "failed_detail": [],
+ "check_type": "CLUSTER",
+ "id": "CONFIG_MERGE"
+ },
+ showClusterCheckPopupCalledCount: 0,
+ showUpgradeConfigsMergePopupCalledCount: 0,
+ upgradeCalledCount: 1,
+ title: 'upgrade is started if configs merge conflicts are absent'
},
{
check: {