Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure correct default values for archiva model 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1445274 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-12 17:13:23 +00:00
parent 600d8258c1
commit b2130aacec
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
View File

@ -1564,6 +1564,7 @@
<description>ssl LDAP connection.</description> <description>ssl LDAP connection.</description>
<version>1.4.0+</version> <version>1.4.0+</version>
<type>boolean</type> <type>boolean</type>
<defaultValue>false</defaultValue>
</field> </field>
<field> <field>
<name>baseDn</name> <name>baseDn</name>
@ -1606,12 +1607,14 @@
<description>The LDAP authenticator enabled.</description> <description>The LDAP authenticator enabled.</description>
<version>1.4.0+</version> <version>1.4.0+</version>
<type>boolean</type> <type>boolean</type>
<defaultValue>false</defaultValue>
</field> </field>
<field> <field>
<name>writable</name> <name>writable</name>
<description>LDAP writable.</description> <description>LDAP writable.</description>
<version>1.4.0+</version> <version>1.4.0+</version>
<type>boolean</type> <type>boolean</type>
<defaultValue>false</defaultValue>
</field> </field>
<field> <field>
<name>extraProperties</name> <name>extraProperties</name>

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

@ -1637,7 +1637,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
$.ajax("restServices/redbackServices/ldapGroupMappingService/ldapGroups", { $.ajax("restServices/redbackServices/ldapGroupMappingService/ldapGroups", {
type: "GET", type: "GET",
dataType: 'json', dataType: 'json',
success: function(data) { complete: function(data) {
var groups = []; var groups = [];
if(data&&data.strings){ if(data&&data.strings){
groups = $.isArray(data.strings)? $.map(data.strings,function(item){ groups = $.isArray(data.strings)? $.map(data.strings,function(item){

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

@ -1029,7 +1029,7 @@
${$.i18n.prop('redback.runtime.ldap.writable.label')} ${$.i18n.prop('redback.runtime.ldap.writable.label')}
</label> </label>
<div class="controls"> <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"/> data-bind="checked: redbackRuntimeConfiguration().ldapConfiguration().writable"/>
</div> </div>
</div> </div>