MRM-1810 removed properties filter, added i18n help content

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 6609be99dc73194e7866085192ea23094acb6aec..fd6a5b91d67cfe6246deb1cb3856f06dbb2b1d7d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -630,6 +630,8 @@ security.rememberme.path.help.content=Path for rememberme cookie.
 security.rememberme.secure.help.content=rememberme cookie secured.
 security.rememberme.domain.help.content=rememberme cookie domain.
 security.policy.unlockable.accounts.help.content=Non lockable accounts.
+ldap.config.groups.class.help.content=The name of the objectClass in the ldap server used to identify groups. The default is groupOfUniqueNames.
+ldap.config.groups.member.help.content=The name of the attribute on a group that contains the user DN of group members. The default is uniqueMember.
 ldap.config.mapper.attribute.fullname.help.content=The name of the attribute on a user that contains the users fullName.
 security.policy.password.rule.characterlength.enabled.help.content=Character length password rule enabled.
 security.policy.password.rule.musthave.enabled.help.content=Password mandatory rule enabled.

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 1397b4eaf1e110a9647b8dd3dd048d033d32bc8e..08467d7fde52b2b5b49376e7c2e0edae0407fc76 100644 (file)
--- 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
@@ -1269,8 +1269,6 @@
   <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>
         <a class="popover-doc"