Author: jaimin
Date: Wed Apr 3 18:41:52 2013
New Revision: 1464149
URL: http://svn.apache.org/r1464149
Log:
AMBARI-1775. Security wizard - Javascript error is thrown when zooKeeper is
included as a secure service. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
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=1464149&r1=1464148&r2=1464149&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Apr 3 18:41:52 2013
@@ -544,6 +544,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1775. Security wizard - Javascript error is thrown when zooKeeper
+ is included as a secure service. (jaimin)
+
AMBARI-1771. On clicking master component host on Oozie and Hive
service page javascript error is encountered.(jaimin)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js?rev=1464149&r1=1464148&r2=1464149&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
Wed Apr 3 18:41:52 2013
@@ -380,7 +380,7 @@ App.MainAdminSecurityAddStep3Controller
console.log("TRACE: In setServiceTagNames function:");
//var serviceConfigTags = this.get('serviceConfigTags');
for (var index in configs) {
- if (secureService.sites.contains(index)) {
+ if (secureService.sites && secureService.sites.contains(index)) {
var serviceConfigObj = {
siteName: index,
tagName: configs[index].tag,
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=1464149&r1=1464148&r2=1464149&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
Wed Apr 3 18:41:52 2013
@@ -132,7 +132,7 @@ App.MainAdminSecurityDisableController =
*/
setServiceTagNames: function (secureService, configs) {
for (var index in configs) {
- if (secureService.sites.contains(index)) {
+ if (secureService.sites && secureService.sites.contains(index)) {
var serviceConfigObj = {
siteName: index,
tagName: configs[index].tag,
