You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/10/21 21:49:50 UTC
ambari git commit: AMBARI-18648. There were no labels on fields on
step "Configure Kerberos" after clicking back (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 e570a39fb -> 7b1a00416
AMBARI-18648. There were no labels on fields on step "Configure Kerberos" after clicking back (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7b1a0041
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7b1a0041
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7b1a0041
Branch: refs/heads/branch-2.4
Commit: 7b1a0041629387295ae35b78a47a285abcd24208
Parents: e570a39
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Oct 21 22:09:38 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sat Oct 22 00:49:45 2016 +0300
----------------------------------------------------------------------
.../app/controllers/main/admin/kerberos/step2_controller.js | 2 +-
ambari-web/app/utils/config.js | 6 ++++--
.../controllers/main/admin/kerberos/step2_controller_test.js | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7b1a0041/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index dbea0b2..992fd34 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -97,7 +97,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
App.config.setPreDefinedServiceConfigs(this.get('addMiscTabToPage'));
var stored = this.get('content.serviceConfigProperties');
- this.set('configs', stored || this.getKerberosConfigs());
+ this.set('configs', stored ? App.config.mergeStoredValue(this.getKerberosConfigs(), stored) : this.getKerberosConfigs());
this.filterConfigs(this.get('configs'));
if (!this.get('wizardController.skipClientInstall')) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/7b1a0041/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 3dd8926..40f5d87 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1154,16 +1154,18 @@ App.config = Em.Object.create({
* Merge values in "stored" to "base" if name matches, it's a value only merge.
* @param base {Array} Em.Object
* @param stored {Array} Object
+ * @returns {Object[]|Em.Object[]} base
*/
mergeStoredValue: function(base, stored) {
if (stored) {
base.forEach(function (p) {
- var sp = stored.filterProperty("filename", p.filename).findProperty("name", p.name);
+ var sp = stored.filterProperty('filename', p.filename).findProperty('name', p.name);
if (sp) {
- p.set("value", sp.value);
+ Em.set(p, 'value', Em.get(sp, 'value'));
}
});
}
+ return base;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/7b1a0041/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
index dd8263e..2e603da 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
@@ -212,6 +212,7 @@ describe('App.KerberosWizardStep2Controller', function() {
}]);
sinon.stub(controller, 'clearStep');
sinon.stub(App.config, 'setPreDefinedServiceConfigs');
+ sinon.stub(App.config, 'mergeStoredValue');
sinon.stub(controller, 'filterConfigs');
sinon.stub(controller, 'getKerberosConfigs');
sinon.stub(controller, 'initializeKDCStoreProperties');
@@ -233,6 +234,7 @@ describe('App.KerberosWizardStep2Controller', function() {
this.mockStackService.restore();
controller.clearStep.restore();
App.config.setPreDefinedServiceConfigs.restore();
+ App.config.mergeStoredValue.restore();
controller.filterConfigs.restore();
controller.getKerberosConfigs.restore();
controller.initializeKDCStoreProperties.restore();