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/12/11 20:41:23 UTC
[1/2] ambari git commit: AMBARI-14345. Information missing from
header bar in UI
Repository: ambari
Updated Branches:
refs/heads/trunk 06855e843 -> d342a7627
AMBARI-14345. Information missing from header bar in UI
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77d68fb9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77d68fb9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77d68fb9
Branch: refs/heads/trunk
Commit: 77d68fb90ee29f3af6b1933fa21862040e6c8b52
Parents: 06855e8
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Dec 11 20:51:39 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Dec 11 20:51:39 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/application.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/77d68fb9/ambari-web/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js
index c623118..0102741 100644
--- a/ambari-web/app/controllers/application.js
+++ b/ambari-web/app/controllers/application.js
@@ -46,8 +46,8 @@ App.ApplicationController = Em.Controller.extend(App.UserPref, {
isExistingClusterDataLoaded: Em.computed.and('App.router.clusterInstallCompleted', 'isClusterDataLoaded'),
enableLinks: function() {
- return this.isExistingClusterDataLoaded && !App.get('isOnlyViewUser');
- }.property(),
+ return this.get('isExistingClusterDataLoaded') && !App.get('isOnlyViewUser');
+ }.property('isExistingClusterDataLoaded'),
/**
* Determines if "Exit" menu-item should be shown
[2/2] ambari git commit: AMBARI-14348. Enabling AD security fails
with 500 server error
Posted by al...@apache.org.
AMBARI-14348. Enabling AD security fails with 500 server error
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d342a762
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d342a762
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d342a762
Branch: refs/heads/trunk
Commit: d342a7627975226c7c6a32f45f333a6fa24bc842
Parents: 77d68fb
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Dec 11 21:22:36 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Dec 11 21:22:36 2015 +0200
----------------------------------------------------------------------
.../main/admin/kerberos/step2_controller.js | 14 ++++++++++++++
.../mixins/common/kdc_credentials_controller_mixin.js | 7 ++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d342a762/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 9963523..4f9e0fb 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -101,6 +101,8 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
var kerberosWizardController = this.controllers.get('kerberosWizardController');
var manageIdentitiesConfig = configs.findProperty('name', 'manage_identities');
+ configs.filterProperty('serviceName', 'KERBEROS').setEach('isVisible', true);
+ this.setKDCTypeProperty(configs);
if (kdcType === Em.I18n.t('admin.kerberos.wizard.step1.option.manual')) {
if (kerberosWizardController.get('skipClientInstall')) {
kerberosWizardController.overrideVisibility(configs, false, kerberosWizardController.get('exceptionsOnSkipClient'));
@@ -267,5 +269,17 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
var primaryText = Em.I18n.t('common.exitAnyway');
var msg = Em.I18n.t('services.service.config.connection.exitPopup.msg');
App.showConfirmationPopup(primary, msg, null, null, primaryText)
+ },
+
+ setKDCTypeProperty: function(configs) {
+ var selectedOption = this.get('content.kerberosOption');
+ var kdcTypeProperty = configs.filterProperty('filename', 'kerberos-env.xml').findProperty('name', 'kdc_type');
+ var kdcValuesMap = App.router.get('mainAdminKerberosController.kdcTypesValues');
+ var kdcTypeValue = Em.keys(kdcValuesMap).filter(function(typeAlias) {
+ return Em.get(kdcValuesMap, typeAlias) === selectedOption;
+ })[0];
+ if (kdcTypeProperty) {
+ Em.set(kdcTypeProperty, 'value', kdcValuesMap[kdcTypeValue]);
+ }
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/d342a762/ambari-web/app/mixins/common/kdc_credentials_controller_mixin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/kdc_credentials_controller_mixin.js b/ambari-web/app/mixins/common/kdc_credentials_controller_mixin.js
index 9d42410..45bc551 100644
--- a/ambari-web/app/mixins/common/kdc_credentials_controller_mixin.js
+++ b/ambari-web/app/mixins/common/kdc_credentials_controller_mixin.js
@@ -121,7 +121,12 @@ App.KDCCredentialsControllerMixin = Em.Mixin.create({
configObject.isEditable = false;
}
}
- configs.pushObject(configObject);
+ var configProperty = configs.findProperty('name', configObject.name);
+ if (!Em.isNone(configProperty)) {
+ Em.setProperties(configProperty, configObject);
+ } else {
+ configs.pushObject(configObject);
+ }
});
},