Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-03-07 00:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1445990 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-13 23:52:34 +00:00
parent 5949f62832
commit c7292ca00e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
View File

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

5
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
View File

@ -1213,9 +1213,11 @@ <h5>${$.i18n.prop('redback.runtime.user-managers.impls.available')}</h5>
</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 @@ <h5>${$.i18n.prop('redback.runtime.user-managers.impls.available')}</h5>
<td>${row.key}</td>
<td><input type="text" class="input-xxlarge" data-bind="value: row.value"></td>
</tr>
{{/if}}
{{/each}}
</tbody>