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

AWC-541; issue where category link was not removed when category is removed.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-02-20 09:39:23 +00:00
parent ed1d92b0eb
commit 1b99b353eb
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/java/org/alfresco/web/bean/CategoriesBean.java
View File

@@ -81,9 +81,9 @@ public class CategoriesBean implements IContextListener
/** Action category node */ /** Action category node */
private Node actionCategory = null; private Node actionCategory = null;
/** Member Count of the linked items of a category */ /** Members of the linked items of a category */
private Integer members = null; private Collection<ChildAssociationRef> members = null;
/** Dialog properties */ /** Dialog properties */
private String name = null; private String name = null;
@@ -196,7 +196,7 @@ public class CategoriesBean implements IContextListener
*/ */
public int getMembers() public int getMembers()
{ {
return (this.members != null ? this.members.intValue() : 0); return (this.members != null ? this.members.size() : 0);
} }
/** /**
@@ -219,13 +219,13 @@ public class CategoriesBean implements IContextListener
// setup form properties // setup form properties
this.name = node.getName(); this.name = node.getName();
this.description = (String)node.getProperties().get(ContentModel.PROP_DESCRIPTION); this.description = (String)node.getProperties().get(ContentModel.PROP_DESCRIPTION);
this.members = this.categoryService.getChildren(node.getNodeRef(), Mode.MEMBERS, Depth.ANY).size(); this.members = this.categoryService.getChildren(node.getNodeRef(), Mode.MEMBERS, Depth.ANY);
} }
else else
{ {
this.name = null; this.name = null;
this.description = null; this.description = null;
this.members = 0; this.members = Collections.emptyList();
} }
} }
@@ -552,8 +552,33 @@ public class CategoriesBean implements IContextListener
tx.begin(); tx.begin();
// delete the category node using the nodeservice // delete the category node using the nodeservice
NodeRef nodeRef = getActionCategory().getNodeRef(); NodeRef categoryNodeRef = getActionCategory().getNodeRef();
this.categoryService.deleteCategory(nodeRef); this.categoryService.deleteCategory(categoryNodeRef);
// if there are other items in the repository using this category
// all the associations to the category should be removed too
if (this.members != null && this.members.size() > 0)
{
for (ChildAssociationRef childRef : this.members)
{
List<NodeRef> list = new ArrayList<NodeRef>(this.members.size());
NodeRef member = childRef.getChildRef();
Collection<NodeRef> categories = (Collection<NodeRef>)this.nodeService.
getProperty(member, ContentModel.PROP_CATEGORIES);
for (NodeRef category : categories)
{
if (category.equals(categoryNodeRef) == false)
{
list.add(category);
}
}
// persist the list back to the repository
this.nodeService.setProperty(member, ContentModel.PROP_CATEGORIES, (Serializable)list);
}
}
// commit the transaction // commit the transaction
tx.commit(); tx.commit();
@@ -563,7 +588,7 @@ public class CategoriesBean implements IContextListener
IBreadcrumbHandler handler = location.get(location.size() - 1); IBreadcrumbHandler handler = location.get(location.size() - 1);
// see if the current breadcrumb location is our node // see if the current breadcrumb location is our node
if ( nodeRef.equals(((IRepoBreadcrumbHandler)handler).getNodeRef()) ) if ( categoryNodeRef.equals(((IRepoBreadcrumbHandler)handler).getNodeRef()) )
{ {
location.remove(location.size() - 1); location.remove(location.size() - 1);