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 2015/01/28 20:11:27 UTC
ambari git commit: AMBARI-9384. Admin > Kerberos page shows
duplicated tabs (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 1ce3af0a5 -> 4884a307a
AMBARI-9384. Admin > Kerberos page shows duplicated tabs (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4884a307
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4884a307
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4884a307
Branch: refs/heads/trunk
Commit: 4884a307ac6a823a1f670c421916f84b71ebe74b
Parents: 1ce3af0
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Jan 28 21:08:54 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Jan 28 21:11:02 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/admin/kerberos.js | 11 ++++++++++-
.../main/admin/stack_and_upgrade_controller_test.js | 3 +--
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4884a307/ambari-web/app/controllers/main/admin/kerberos.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js
index 03ec722..da27a35 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -175,7 +175,16 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
}
});
},
-
+
+ /**
+ * Override <code>App.KerberosWizardStep4Controller</code>
+ *
+ * @param {App.ServiceConfigProperty[]} properties
+ */
+ setStepConfigs: function (properties) {
+ this.get('stepConfigs').clear();
+ this._super(properties);
+ },
/**
* Override <code>App.KerberosWizardStep4Controller</code>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4884a307/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 d28e683..f47219c 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
@@ -520,8 +520,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
expect(App.db.set.calledWith('repoVersionInstall', 'id', [1])).to.be.true;
expect(App.clusterStatus.setClusterStatus.calledOnce).to.be.true;
expect(App.RepositoryVersion.find.calledWith(1)).to.be.true;
- expect(mock.set.calledWith('stackVersion.state', 'INSTALLING')).to.be.true;
- });
+ expect(mock.set.calledWith('defaultStatus', 'INSTALLING')).to.be.true; });
});
describe("#setUpgradeItemStatus()", function () {