svn commit: r1469298 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js

[olamy]

Author: olamy
Date: Thu Apr 18 12:43:25 2013
New Revision: 1469298

URL: http://svn.apache.org/r1469298
Log:
fix possible javascript npe

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1469298&r1=1469297&r2=1469298&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
 Thu Apr 18 12:43:25 2013
@@ -1906,6 +1906,8 @@ define("archiva.general-admin",["jquery"
                     
||$.inArray("ldap",redbackRuntimeConfiguration.rbacManagerImpls())>=0;
             $.log("useLdap:"+useLdap);
             if(useLdap){
+              $.log("in get ldap groups");
+
               // load ldap roles
               
$.ajax("restServices/redbackServices/ldapGroupMappingService/ldapGroups", {
                 type: "GET",
@@ -1939,6 +1941,7 @@ define("archiva.general-admin",["jquery"
                 }
               );
             } else {
+              $.log("before displayRuntimeConfigurationScreen");
               
displayRuntimeConfigurationScreen(redbackRuntimeConfigurationViewModel,null,null);
             }
           }
@@ -1955,7 +1958,8 @@ define("archiva.general-admin",["jquery"
     });
 
     
redbackRuntimeConfigurationViewModel.allRoleNames=ko.observableArray(allRoleNames);
-    if 
(redbackRuntimeConfigurationViewModel.redbackRuntimeConfiguration().ldapConfiguration().useRoleNameAsGroup())
 {
+
+    if 
(redbackRuntimeConfigurationViewModel.redbackRuntimeConfiguration().ldapConfiguration().useRoleNameAsGroup()&&groups)
 {
       // if using groups == roles add all as mapping except already mapped
       $.each(groups,function(idx,item){
         var exists=false;
@@ -1971,6 +1975,7 @@ define("archiva.general-admin",["jquery"
 
       });
     }
+
     
redbackRuntimeConfigurationViewModel.redbackRuntimeConfiguration().ldapGroupMappings=ko.observableArray(groupMappings?groupMappings:[]);
     
redbackRuntimeConfigurationViewModel.redbackRuntimeConfiguration().modified(false);