git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1445274 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M4
@@ -719,7 +719,7 @@ public class DefaultArchivaConfiguration | |||
List<String> dbConsumers = Arrays.asList( "update-db-artifact", "update-db-repository-metadata" ); | |||
// remove database consumers if here | |||
// remove database consumers if here | |||
List<String> intersec = | |||
ListUtils.intersection( dbConsumers, configuration.getRepositoryScanning().getKnownContentConsumers() ); | |||
@@ -1564,6 +1564,7 @@ | |||
<description>ssl LDAP connection.</description> | |||
<version>1.4.0+</version> | |||
<type>boolean</type> | |||
<defaultValue>false</defaultValue> | |||
</field> | |||
<field> | |||
<name>baseDn</name> | |||
@@ -1606,12 +1607,14 @@ | |||
<description>The LDAP authenticator enabled.</description> | |||
<version>1.4.0+</version> | |||
<type>boolean</type> | |||
<defaultValue>false</defaultValue> | |||
</field> | |||
<field> | |||
<name>writable</name> | |||
<description>LDAP writable.</description> | |||
<version>1.4.0+</version> | |||
<type>boolean</type> | |||
<defaultValue>false</defaultValue> | |||
</field> | |||
<field> | |||
<name>extraProperties</name> |
@@ -1637,7 +1637,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" | |||
$.ajax("restServices/redbackServices/ldapGroupMappingService/ldapGroups", { | |||
type: "GET", | |||
dataType: 'json', | |||
success: function(data) { | |||
complete: function(data) { | |||
var groups = []; | |||
if(data&&data.strings){ | |||
groups = $.isArray(data.strings)? $.map(data.strings,function(item){ |
@@ -1029,7 +1029,7 @@ | |||
${$.i18n.prop('redback.runtime.ldap.writable.label')} | |||
</label> | |||
<div class="controls"> | |||
<input type="checkbox" id="ldap-writable" name="ldap-ssl" | |||
<input type="checkbox" id="ldap-writable" name="ldap-writable" | |||
data-bind="checked: redbackRuntimeConfiguration().ldapConfiguration().writable"/> | |||
</div> | |||
</div> |