mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.1-A to HEAD
8241: Implemented location based breadcrumb mode Default switched to 'path' git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -48,6 +48,8 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
private static Log logger = LogFactory.getLog(ClientConfigElement.class);
|
||||
|
||||
public static final String CONFIG_ELEMENT_ID = "client";
|
||||
public static final String BREADCRUMB_PATH = "path";
|
||||
public static final String BREADCRUMB_LOCATION = "location";
|
||||
|
||||
private static final String DEFAULT_FROM_ADDRESS = "alfresco@alfresco.org";
|
||||
|
||||
@@ -74,6 +76,7 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
private List<QName> simpleSearchAdditionalAttributes = null;
|
||||
private int minUsernameLength = 2;
|
||||
private int minPasswordLength = 3;
|
||||
private String breadcrumbMode = BREADCRUMB_PATH;
|
||||
private String cifsURLSuffix;
|
||||
|
||||
/**
|
||||
@@ -236,7 +239,13 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
if ( newElement.getCifsURLSuffix() != null &&
|
||||
newElement.getCifsURLSuffix().equals(combinedElement.getCifsURLSuffix()) == false)
|
||||
{
|
||||
combinedElement.setCifsURLSuffix(newElement.getCifsURLSuffix());
|
||||
combinedElement.setCifsURLSuffix(newElement.getCifsURLSuffix());
|
||||
}
|
||||
|
||||
if (newElement.getBreadcrumbMode() != null &&
|
||||
newElement.getBreadcrumbMode().equals(combinedElement.getBreadcrumbMode()) == false)
|
||||
{
|
||||
combinedElement.setBreadcrumbMode(newElement.getBreadcrumbMode());
|
||||
}
|
||||
|
||||
return combinedElement;
|
||||
@@ -631,6 +640,30 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
this.minPasswordLength = minPasswordLength;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the breadcrumb mode
|
||||
*
|
||||
* @return String
|
||||
*/
|
||||
public final String getBreadcrumbMode()
|
||||
{
|
||||
return breadcrumbMode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the breadcrumb mode
|
||||
*
|
||||
* @param mode String
|
||||
*/
|
||||
void setBreadcrumbMode(String mode)
|
||||
{
|
||||
// make sure it's being set to a valid option
|
||||
if (BREADCRUMB_PATH.equals(mode) || BREADCRUMB_LOCATION.equals(mode))
|
||||
{
|
||||
breadcrumbMode = mode;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the CIFs URL suffix
|
||||
*
|
||||
|
Reference in New Issue
Block a user