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

fix build problem with message bundles, changed list to map in wizard config, added null checks when using custom types and fixed topic.gif

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-03-21 15:45:04 +00:00
parent ebf71bf211
commit 6d7516ecd1
6 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/web/bean/AdvancedSearchBean.java
View File

@@ -584,20 +584,23 @@ public class AdvancedSearchBean
for (String type : types)
{
QName idQName = Repository.resolveToQName(type);
TypeDefinition typeDef = dictionaryService.getType(idQName);
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
if (idQName != null)
{
// try and get label from the dictionary
String label = typeDef.getTitle();
TypeDefinition typeDef = dictionaryService.getType(idQName);
// else just use the localname
if (label == null)
if (typeDef != null && dictionaryService.isSubClass(typeDef.getName(), ContentModel.TYPE_CONTENT))
{
label = idQName.getLocalName();
// try and get label from the dictionary
String label = typeDef.getTitle();
// else just use the localname
if (label == null)
{
label = idQName.getLocalName();
}
this.contentTypes.add(new SelectItem(idQName.toString(), label));
}
this.contentTypes.add(new SelectItem(idQName.toString(), label));
}
}