You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/03/25 22:09:56 UTC
svn commit: r1460894 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/controllers/main/admin/security/disable.js
Author: jaimin
Date: Mon Mar 25 21:09:55 2013
New Revision: 1460894
URL: http://svn.apache.org/r1460894
Log:
AMBARI-1705. Remove redundant API calls to update service configuration while disabling security. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1460894&r1=1460893&r2=1460894&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Mar 25 21:09:55 2013
@@ -519,6 +519,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1705. Remove redundant API calls to update service configuration
+ while disabling security. (jaimin)
+
AMBARI-1661. For custom advanced properties, a new config with an empty key
can be added. (yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js?rev=1460894&r1=1460893&r2=1460894&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js Mon Mar 25 21:09:55 2013
@@ -32,6 +32,7 @@ App.MainAdminSecurityDisableController =
clearStep: function () {
this.get('stages').clear();
this.get('secureServices').clear();
+ this.get('serviceConfigTags').clear();
},
loadStep: function () {
@@ -126,6 +127,25 @@ App.MainAdminSecurityDisableController =
stage4.set('data', data);
},
+ /**
+ * set tagnames for configuration of the *-site.xml
+ */
+ setServiceTagNames: function (secureService, configs) {
+ for (var index in configs) {
+ if (secureService.sites.contains(index)) {
+ var serviceConfigObj = {
+ siteName: index,
+ tagName: configs[index].tag,
+ newTagName: null,
+ configs: {}
+ };
+ console.log("The value of serviceConfigTags[index]: " + configs[index]);
+ this.get('serviceConfigTags').pushObject(serviceConfigObj);
+ }
+ }
+ return serviceConfigObj;
+ },
+
loadClusterConfigs: function () {
var self = this;
var url = App.apiPrefix + '/clusters/' + App.router.getClusterName();
@@ -237,27 +257,6 @@ App.MainAdminSecurityDisableController =
});
},
- /**
- * set tagnames for configuration of the *-site.xml
- */
- setServiceTagNames: function (secureServiceName, configs) {
- console.log("TRACE: In setServiceTagNames function:");
- //var serviceConfigTags = this.get('serviceConfigTags');
- for (var index in configs) {
- var serviceConfigObj = {
- serviceName: secureServiceName,
- siteName: index,
- tagName: configs[index].tag,
- newTagName: null,
- configs: {}
- };
- console.log("The value of serviceConfigTags[index]: " + configs[index]);
- this.get('serviceConfigTags').pushObject(serviceConfigObj);
- }
- return serviceConfigObj;
- },
-
-
getAllConfigsFromServer: function () {
this.set('noOfWaitingAjaxCalls', this.get('serviceConfigTags').length - 1);
this.get('serviceConfigTags').forEach(function (_serviceConfigTags) {