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

Merged V3.2 to HEAD

Browse Source 
16740: Fix for ETHREEOH-2563 and ETHREEOH-2899.
   16741: Fix for ETHREEOH-1781 - web-client-config-custom.xml.unicode.sample has incorrect comment.
   16757: Merged DEV-TEMPORARY to V3.2
      16730: ETHREEOH-2749: Entering a search containing a single quote breaks the script that performs next/previous page in OpenSearch JSF component
      16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
      16732: ETHREEOH-1944: Navigation via shortcuts brings up incorrect dialogs
   16761: Merged DEV-TEMPORARY to V3.2
      16750: ETHREEOH-2405: system error if user goto Web Projects space from any web project which was deleted by another user.
   16762: Displaying error title when error text is displayed
   16763: Merged DEV-TEMPORARY to V3.2
      16756: ETHREEOH-258: System Error message appears while clicking "Manage Task" icon in "My Completed Task" component for the task, if the user to whom the workflow was assign to is deleted.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-14 11:08:21 +00:00
parent 94f41494f6
commit ba3f9629b5
7 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
View File

@@ -317,7 +317,7 @@ public abstract class BaseAssociationEditor extends UIInput
String targetType = assocDef.getTargetClass().getName().toString();
boolean allowMany = assocDef.isTargetMany();
populateAssocationMaps((Node)getValue());
populateAssocationMaps((Node)getValue(), nodeService);
if (isDisabled())
{
@@ -655,8 +655,9 @@ public abstract class BaseAssociationEditor extends UIInput
* Populates all the internal Maps with the appropriate association reference objects
*
* @param node The Node we are dealing with
* @param nodeService The NodeService
*/
protected abstract void populateAssocationMaps(Node node);
protected abstract void populateAssocationMaps(Node node, NodeService nodeService);
/**
* Renders the existing associations in a read-only form

11
source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
View File

@@ -73,10 +73,10 @@ public class UIAssociationEditor extends BaseAssociationEditor
}
/**
* @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#populateAssocationMaps(org.alfresco.web.bean.repository.Node)
* @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#populateAssocationMaps(org.alfresco.web.bean.repository.Node, org.alfresco.service.cmr.repository.NodeService)
*/
@SuppressWarnings("unchecked")
protected void populateAssocationMaps(Node node)
protected void populateAssocationMaps(Node node, NodeService nodeService)
{
// we need to remember the original set of associations (if there are any)
// and place them in a map keyed by the noderef of the child node
@@ -92,8 +92,11 @@ public class UIAssociationEditor extends BaseAssociationEditor
{
AssociationRef assoc = (AssociationRef)iter.next();
// add the association to the map
this.originalAssocs.put(assoc.getTargetRef().toString(), assoc);
if (nodeService.exists(assoc.getTargetRef()))
{
// add the association to the map
this.originalAssocs.put(assoc.getTargetRef().toString(), assoc);
}
}
}
}

4
source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java
View File

@@ -70,10 +70,10 @@ public class UIChildAssociationEditor extends BaseAssociationEditor
}
/**
* @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#populateAssocationMaps(org.alfresco.web.bean.repository.Node)
* @see org.alfresco.web.ui.repo.component.property.BaseAssociationEditor#populateAssocationMaps(org.alfresco.web.bean.repository.Node, org.alfresco.service.cmr.repository.NodeService)
*/
@SuppressWarnings("unchecked")
protected void populateAssocationMaps(Node node)
protected void populateAssocationMaps(Node node, NodeService nodeService)
{
// we need to remember the original set of associations (if there are any)
// and place them in a map keyed by the noderef of the child node