cleanup logging and not displayed mapped ldap group to roles in screen

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1445990 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 9 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
index 6f2ab26f7..391b29bc8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
@@ -1231,16 +1231,12 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
 
     this.migratedFromRedbackConfiguration=ko.observable(migratedFromRedbackConfiguration);
 
-    $.log("new RedbackRuntimeConfiguration before configurationPropertiesEntries mapping:");
-
     this.configurationPropertiesEntries=ko.observableArray(configurationPropertiesEntries?configurationPropertiesEntries:[]);
     this.configurationPropertiesEntries.subscribe(function(newValue){
       self.modified(true);
       $.log("configurationPropertiesEntries modified")
     });
 
-    $.log("new RedbackRuntimeConfiguration before configurationPropertiesEntries mapping done");
-
     this.findPropertyValue=function(key){
       for(var i=0;i<self.configurationPropertiesEntries().length;i++){
         if(self.configurationPropertiesEntries()[i].key==key){
@@ -1266,22 +1262,29 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
   }
 
   mapRedbackRuntimeConfiguration=function(data){
-    $.log("mapRedbackRuntimeConfiguration");
+
     var ldapConfiguration=mapLdapConfiguration(data.ldapConfiguration);
-    $.log("mapLdapConfiguration done for ");
 
     var redbackRuntimeConfiguration =
             new RedbackRuntimeConfiguration(data.userManagerImpls,ldapConfiguration,data.migratedFromRedbackConfiguration,[]
                     ,data.useUsersCache,mapCacheConfiguration(data.usersCacheConfiguration));
 
-    $.log("mapRedbackRuntimeConfiguration done");
+
     var configurationPropertiesEntries = data.configurationPropertiesEntries == null ? []: $.each(data.configurationPropertiesEntries,function(item){
-      return new Entry(item.key, item.value,function(newValue){
+      var entry = new Entry(item.key, item.value,function(newValue){
         redbackRuntimeConfiguration.modified(true);
       });
+      return entry;
     });
+
     if (!$.isArray(configurationPropertiesEntries)){
       configurationPropertiesEntries=[];
+    } else {
+      configurationPropertiesEntries = $.each(configurationPropertiesEntries,function(item){
+        $.log("each configurationPropertiesEntries");
+        $.log("key:"+item);
+        return item;
+      });
     }
     redbackRuntimeConfiguration.configurationPropertiesEntries(configurationPropertiesEntries);
     redbackRuntimeConfiguration.modified(false);
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
index d5fba1040..56be27cc1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
@@ -1213,9 +1213,11 @@
   </thead>
   <tbody>
   {{each(i, row) itemsOnCurrentPage()}}
+    {{var key = row.key}}
+    <!-- do not display mapped ldap groups as keys -->
+    {{if !key.startsWith('ldap.config.groups.')}}
     <tr>
       <td>
-        {{var key = row.key}}
         <a class="popover-doc"
            data-original-title="${$.i18n.prop('redback.runtime.properties.help.title')}"
            data-content="${$.i18n.prop(key+'.help.content')}">
@@ -1225,6 +1227,7 @@
       <td>${row.key}</td>
       <td><input type="text" class="input-xxlarge" data-bind="value: row.value"></td>
     </tr>
+    {{/if}}
   {{/each}}
   </tbody>