From 02c964a5f84d11cf8dfdb32a73a1ac3a681e837d Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 15 Nov 2011 12:15:46 +0000 Subject: [PATCH] Fix for ALF-11490 - It is impossible to rename or delete the category. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/categories/CategoriesDialog.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java index f3b12b4d44..2e960b87e5 100644 --- a/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java +++ b/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java @@ -485,7 +485,8 @@ public class CategoriesDialog extends BaseDialogBean implements IContextListener } else { - handler=new CategoryBreadcrumbHandler (getCategory().getNodeRef(), Repository.getNameForNode(getNodeService(), getCategory().getNodeRef())); + handler = new CategoryBreadcrumbHandler( + getCategory().getNodeRef(), Repository.getNameForNode(getNodeService(), getCategory().getNodeRef())); location.set(location.size() - 1, handler); this.setCurrentCategory(handler.nodeRef); } @@ -590,7 +591,7 @@ public class CategoriesDialog extends BaseDialogBean implements IContextListener // when selected we set the current category Id and return setCurrentCategory(this.nodeRef); setLocation((List)breadcrumb.getValue()); - + return null; } @@ -625,14 +626,14 @@ public class CategoriesDialog extends BaseDialogBean implements IContextListener public void restored() { Object categoryToRemove = FacesContext.getCurrentInstance().getExternalContext(). - getRequestMap().get(KEY_CATEGORY); + getRequestMap().get(KEY_CATEGORY); if (categoryToRemove != null) - { - if (logger.isDebugEnabled()) - logger.debug("Removing group '" + categoryToRemove + "' from breadcrumb"); - - removeFromBreadcrumb((String)categoryToRemove); - } + { + if (logger.isDebugEnabled()) + logger.debug("Removing group '" + categoryToRemove + "' from breadcrumb"); + + removeFromBreadcrumb((String)categoryToRemove); + } contextUpdated(); }