inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Morning merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-22 17:20:58 +00:00
parent ea740e26bf
commit 9189208bad
11 changed files with 54 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
View File

@@ -104,6 +104,14 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter
}
}
if (newElement.getFolderTypes() != null)
{
for (String type : newElement.getFolderTypes())
{
combinedElement.addFolderType(type);
}
}
if (newElement.getCustomProperties() != null)
{
for (CustomProperty property : newElement.getCustomProperties())