瀏覽代碼

AMBARI-1775. Security wizard - Javascript error is thrown when zooKeeper is included as a secure service. (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1464149 13f79535-47bb-0310-9956-ffa450edef68
Jaimin Jetly 12 年之前
父節點
當前提交
9541fd394d

+ 3 - 0
CHANGES.txt

@@ -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)
 

+ 1 - 1
ambari-web/app/controllers/main/admin/security/add/step3.js

@@ -380,7 +380,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
     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,

+ 1 - 1
ambari-web/app/controllers/main/admin/security/disable.js

@@ -132,7 +132,7 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
    */
   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,