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/10/30 11:22:38 UTC
[1/2] ambari git commit: AMBARI-13653 Ranger authentication method
when updated via recommendation API doe not change the related accordion.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 55c150be1 -> 37fb051ae
AMBARI-13653 Ranger authentication method when updated via recommendation API doe not change the related accordion. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/227bd813
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/227bd813
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/227bd813
Branch: refs/heads/trunk
Commit: 227bd813e5ce0ee6aaec6d77e127d02f580ce638
Parents: 55c150b
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Oct 30 12:18:42 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 30 12:22:36 2015 +0200
----------------------------------------------------------------------
ambari-web/app/views/common/controls_view.js | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/227bd813/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index b305249..9f3d2ca 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -775,13 +775,9 @@ App.ServiceConfigRadioButton = Ember.Checkbox.extend(App.SupportsDependentConfig
if (this.get('clicked')) {
this.sendRequestRorDependentConfigs(this.get('parentView.serviceConfig'));
Em.run.next(this, function() {
- console.debug('App.ServiceConfigRadioButton.onChecked');
this.set('parentView.serviceConfig.value', this.get('value'));
- var components = this.get('parentView.serviceConfig.options');
- if (components && components.someProperty('foreignKeys')) {
- this.get('controller.stepConfigs').findProperty('serviceName', this.get('parentView.serviceConfig.serviceName')).propertyDidChange('errorCount');
- }
this.set('clicked', false);
+ this.updateForeignKeys();
});
}
}.observes('checked'),
@@ -789,9 +785,18 @@ App.ServiceConfigRadioButton = Ember.Checkbox.extend(App.SupportsDependentConfig
updateCheck: function() {
if (!this.get('clicked')) {
this.set('checked', this.get('parentView.serviceConfig.value') === this.get('value'));
+ this.updateForeignKeys();
}
}.observes('parentView.serviceConfig.value'),
+ updateForeignKeys: function() {
+ var components = this.get('parentView.serviceConfig.options');
+ if (components && components.someProperty('foreignKeys')) {
+ this.get('controller.stepConfigs').findProperty('serviceName', this.get('parentView.serviceConfig.serviceName')).propertyDidChange('errorCount');
+ }
+ },
+
+
disabled: function () {
return !this.get('parentView.serviceConfig.isEditable') ||
!['addServiceController', 'installerController'].contains(this.get('controller.wizardController.name')) && /^New\s\w+\sDatabase$/.test(this.get('value'));
[2/2] ambari git commit: AMBARI-13654 Ranger DB host should be left
empty by default. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-13654 Ranger DB host should be left empty by default. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37fb051a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37fb051a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37fb051a
Branch: refs/heads/trunk
Commit: 37fb051ae35f48dd11b73850ac41a916a38efded
Parents: 227bd81
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Oct 30 12:18:59 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 30 12:22:37 2015 +0200
----------------------------------------------------------------------
ambari-web/app/utils/configs/config_property_helper.js | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/37fb051a/ambari-web/app/utils/configs/config_property_helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js
index 5dd5149..23759bb 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -215,13 +215,6 @@ module.exports = {
configProperty.set('isRequired', 'false');
}
break;
- case 'db_host':
- var masterComponent = masterComponentHostsInDB.findProperty('component', 'RANGER_ADMIN');
- if (masterComponent) {
- configProperty.set('value', masterComponent.hostName);
- configProperty.set('recommendedValue', masterComponent.hostName);
- }
- break;
case 'hawq_master_address_host':
configProperty.set('value', masterComponentHostsInDB.findProperty('component', 'HAWQMASTER').hostName);
break;