You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/04/18 15:43:30 UTC
ambari git commit: AMBARI-15941. Fix bugs with config groups
restoring after next/back actions (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b36dbbdf8 -> 4ff426f9b
AMBARI-15941. Fix bugs with config groups restoring after next/back actions (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ff426f9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ff426f9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ff426f9
Branch: refs/heads/trunk
Commit: 4ff426f9b72b1d4080065cd2fd3bc58bf868820a
Parents: b36dbbd
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Apr 18 16:16:56 2016 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Apr 18 16:16:56 2016 +0300
----------------------------------------------------------------------
.../main/service/manage_config_groups_controller.js | 1 +
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
.../main/service/manage_config_groups_controller_test.js | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff426f9/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 854e6c8..c3ac5aa 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -579,6 +579,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, {
this.set('selectedHosts', selectedConfigGroup.get('hosts'));
this.deleteHosts();
this.get('configGroups').removeObject(selectedConfigGroup);
+ App.configGroupsMapper.deleteRecord(selectedConfigGroup);
this.set('selectedConfigGroup', this.get('configGroups').findProperty('isDefault'));
this.propertyDidChange('groupDeleteTrigger');
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff426f9/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 02a555b..2f78adf 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -1034,7 +1034,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
/**
* load default groups for each service in case of initial load
* @param serviceConfigGroups
- * @method loadConfigGroups
+ * @method restoreConfigGroups
*/
restoreConfigGroups: function (serviceConfigGroups) {
var services = this.get('stepConfigs');
http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff426f9/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js b/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
index 4bd2f44..e0ca439 100644
--- a/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
+++ b/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
@@ -177,6 +177,12 @@ describe('App.ManageConfigGroupsController', function() {
configGroups: [defaultGroup, selectedGroup],
selectedConfigGroup: selectedGroup
});
+
+ sinon.stub(App.configGroupsMapper, 'deleteRecord', Em.K);
+ });
+
+ afterEach(function(){
+ App.configGroupsMapper.deleteRecord.restore();
});
it('after deleting some config group, Default should be selected', function () {