mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge from HEAD into WCM-DEV2. Also fixes build breakage in
jndi-client and catalina-virtual that I introduced earlier. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -39,6 +39,7 @@ public class ClientElementReader implements ConfigElementReader
|
||||
public static final String ELEMENT_HOMESPACEPERMISSION = "home-space-permission";
|
||||
public static final String ELEMENT_FROMEMAILADDRESS = "from-email-address";
|
||||
public static final String ELEMENT_SHELFVISIBLE = "shelf-visible";
|
||||
public static final String ELEMENT_AJAX_ENABLED = "ajax-enabled";
|
||||
|
||||
/**
|
||||
* @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
|
||||
@@ -136,6 +137,13 @@ public class ClientElementReader implements ConfigElementReader
|
||||
{
|
||||
configElement.setLoginPage(loginPage.getTextTrim());
|
||||
}
|
||||
|
||||
// get the ajax enabled flag
|
||||
Element ajaxEnabled = element.element(ELEMENT_AJAX_ENABLED);
|
||||
if (ajaxEnabled != null)
|
||||
{
|
||||
configElement.setAjaxEnabled(Boolean.parseBoolean(ajaxEnabled.getTextTrim()));
|
||||
}
|
||||
}
|
||||
|
||||
return configElement;
|
||||
|
Reference in New Issue
Block a user