Merged V3.2 to HEAD

17262: Fix for ETHREEOH-2898: Share Login - using return with auto-complete clears login screen details
   17264: Fix for ETHREEOH-2368 Added category is not visible in "Categories" in Side Bar even after the page is refreshed.
   17266: Merged V3.1 to V3.2
      17265: ETHREEOH-3213 - Error occurs if you try to Configure of Site Wiki dashlet if wiki page name contains russian letters
   17279: Fix for ETHREEOH-3110 - Error page if Add broken number by create(edit) ASR or FSR.
   17281: Fix to unreported error where the NodeBrowser would not display nodes that ...
   17283: ETHREEOH-3037 and ETHREEOH-2158
   17286: Fix for ETHREEOH-3075 Encoding field is displayed as empty on Versioned details page.
   17289: Merged V3.1 to V3.2
      17288: Fix for ETHREEOH-3164 Link Destination (with modify properties of a space link) does ...
   17291: Fix for ETHREEOH-2403 It's possible to create a content with spaces.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-14 15:03:17 +00:00
parent f52a94eb01
commit 3bd4252a04
11 changed files with 74 additions and 20 deletions

View File

@@ -466,8 +466,15 @@ public class AdminNodeBrowseBean implements Serializable
{
if (assocs == null)
{
List<AssociationRef> assocRefs = getNodeService().getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL);
assocs = new ListDataModel(assocRefs);
try
{
List<AssociationRef> assocRefs = getNodeService().getTargetAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL);
assocs = new ListDataModel(assocRefs);
}
catch (UnsupportedOperationException err)
{
// some stores do not support associations
}
}
return assocs;
}