diff --git a/config/alfresco/web-client-config-wcm-actions.xml b/config/alfresco/web-client-config-wcm-actions.xml index dc7f182d77..e05e2331fd 100644 --- a/config/alfresco/web-client-config-wcm-actions.xml +++ b/config/alfresco/web-client-config-wcm-actions.xml @@ -237,44 +237,6 @@ - - - - ChangePermissions - - org.alfresco.web.action.evaluator.ManagePermissionIsMainStoreEvaluator - manage_permissions - /images/icons/edit_group.gif - dialog:managePermissions - #{AVMBrowseBean.setupContentAction} - - #{actionContext.id} - - - - - - set_permissions - org.alfresco.web.action.evaluator.ManagePermissionIsMainStoreEvaluator - /images/icons/manage_permissions.gif - dialog:setPermissions - - - - - - Read - - org.alfresco.web.action.evaluator.ViewPermissionEvaluator - view_permissions - /images/icons/person.gif - dialog:viewPermissions - #{AVMBrowseBean.setupContentAction} - - #{actionContext.id} - - - @@ -384,8 +346,6 @@ - - @@ -397,8 +357,6 @@ - - @@ -456,8 +414,6 @@ - - @@ -467,8 +423,6 @@ - - @@ -506,12 +460,6 @@ - - - - - - diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/AddBlogDetailsEvaluator.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/AddBlogDetailsEvaluator.java deleted file mode 100644 index 152cf0ba5b..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/AddBlogDetailsEvaluator.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import org.alfresco.model.BlogIntegrationModel; -import org.alfresco.web.action.evaluator.BaseActionEvaluator; -import org.alfresco.web.bean.repository.Node; - - -/** - * Add blog details evaluator - * - * @author Roy Wetherall - */ -public class AddBlogDetailsEvaluator extends BaseActionEvaluator implements BlogIntegrationModel -{ - /** - * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node) - */ - public boolean evaluate(Node node) - { - boolean result = false; - if (node.hasAspect(ASPECT_BLOG_DETAILS) == false) - { - result = true; - } - return result; - } -} diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogActionListener.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogActionListener.java deleted file mode 100644 index dc44e591c3..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogActionListener.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import java.util.List; -import java.util.Map; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -import org.alfresco.model.BlogIntegrationModel; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.blogIntegration.BlogDetails; -import org.alfresco.repo.blogIntegration.BlogIntegrationRuntimeException; -import org.alfresco.repo.blogIntegration.BlogIntegrationService; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.namespace.QName; -import org.alfresco.web.app.servlet.FacesHelper; -import org.alfresco.web.bean.BrowseBean; -import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.ui.common.component.UIActionLink; - - -/** - * Blog details action listener - * - * @author Roy Wetherall - */ -public class BlogActionListener implements BlogIntegrationModel -{ - /** The service registry */ - private ServiceRegistry services; - - /** The blog service */ - private BlogIntegrationService blogIntegrationService; - - /** - * Set the service registry - * - * @param services the service registry - */ - public void setServiceRegistry(ServiceRegistry services) - { - this.services = services; - } - - /** - * Set the blog integration service - * - * @param blogIntegrationService the blog integration service - */ - public void setBlogIntegrationService(BlogIntegrationService blogIntegrationService) - { - this.blogIntegrationService = blogIntegrationService; - } - - /** - * Listener's execute method - */ - public void executeScript(ActionEvent event) - { - // Get the script to be executed - UIActionLink link = (UIActionLink)event.getComponent(); - Map params = link.getParameterMap(); - - // Get the action - String action = params.get("action"); - - String id = params.get("id"); - NodeRef documentNodeRef = new NodeRef(Repository.getStoreRef(), id); - if ("post".equals(action) == true) - { - QName type = this.services.getNodeService().getType(documentNodeRef); - if (this.services.getDictionaryService().isSubClass(type, ContentModel.TYPE_CONTENT) == true) - { - List list = this.blogIntegrationService.getBlogDetails(documentNodeRef); - if (list.size() != 0) - { - // Take the 'nearest' blog details - BlogDetails blogDetails = list.get(0); - this.blogIntegrationService.newPost(blogDetails, documentNodeRef, ContentModel.PROP_CONTENT, true); - } - } - } - else if ("update".equals(action) == true) - { - QName type = this.services.getNodeService().getType(documentNodeRef); - if (this.services.getNodeService().hasAspect(documentNodeRef, ASPECT_BLOG_POST) == true && - this.services.getDictionaryService().isSubClass(type, ContentModel.TYPE_CONTENT) == true) - { - this.blogIntegrationService.updatePost(documentNodeRef, ContentModel.PROP_CONTENT, true); - } - } - else if ("remove".equals(action) == true) - { - QName type = this.services.getNodeService().getType(documentNodeRef); - if (this.services.getNodeService().hasAspect(documentNodeRef, ASPECT_BLOG_POST) == true && - this.services.getDictionaryService().isSubClass(type, ContentModel.TYPE_CONTENT) == true) - { - this.blogIntegrationService.deletePost(documentNodeRef); - } - } - else - { - throw new BlogIntegrationRuntimeException("Invalid action has been specified '" + action + "'"); - } - - // Refresh the document details - FacesContext context = FacesContext.getCurrentInstance(); - BrowseBean browseBean = (BrowseBean)FacesHelper.getManagedBean(context, "BrowseBean"); - browseBean.getDocument().reset(); - UIComponent comp = context.getViewRoot().findComponent("dialog:dialog-body:document-props"); - comp.getChildren().clear(); - - } -} diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogDetailsActionListener.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogDetailsActionListener.java deleted file mode 100644 index 0b7a2e46ef..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogDetailsActionListener.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import java.util.Map; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -import org.alfresco.model.BlogIntegrationModel; -import org.alfresco.repo.blogIntegration.BlogIntegrationRuntimeException; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.web.app.servlet.FacesHelper; -import org.alfresco.web.bean.BrowseBean; -import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.ui.common.component.UIActionLink; - - -/** - * Blog details action listener - * - * @author Roy Wetherall - */ -public class BlogDetailsActionListener implements BlogIntegrationModel -{ - /** The service registry */ - private ServiceRegistry services; - - /** - * Set the service registry - * - * @param services the service registry - */ - public void setServiceRegistry(ServiceRegistry services) - { - this.services = services; - } - - /** - * Listener's execute method - */ - public void executeScript(ActionEvent event) - { - // Get the script to be executed - UIActionLink link = (UIActionLink)event.getComponent(); - Map params = link.getParameterMap(); - - String action = params.get("action"); - - String id = params.get("id"); - NodeRef documentNodeRef = new NodeRef(Repository.getStoreRef(), id); - if ("add".equals(action) == true) - { - this.services.getNodeService().addAspect(documentNodeRef, ASPECT_BLOG_DETAILS, null); - } - else if ("remove".equals(action) == true) - { - this.services.getNodeService().removeAspect(documentNodeRef, ASPECT_BLOG_DETAILS); - } - else - { - throw new BlogIntegrationRuntimeException("Invalid action has been specified '" + action + "'"); - } - - FacesContext context = FacesContext.getCurrentInstance(); - BrowseBean browseBean = (BrowseBean)FacesHelper.getManagedBean(context, "BrowseBean"); - browseBean.getActionSpace().reset(); - UIComponent comp = context.getViewRoot().findComponent("dialog:dialog-body:document-props"); - comp.getChildren().clear(); - } -} diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogSelectorGenerator.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogSelectorGenerator.java deleted file mode 100644 index 0a7b492210..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/BlogSelectorGenerator.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import java.util.List; - -import javax.faces.component.UIComponent; -import javax.faces.component.UISelectItems; -import javax.faces.component.UISelectOne; -import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; - -import org.alfresco.repo.blogIntegration.BlogIntegrationImplementation; -import org.alfresco.repo.blogIntegration.BlogIntegrationService; -import org.alfresco.web.app.servlet.FacesHelper; -import org.alfresco.web.bean.generator.BaseComponentGenerator; -import org.alfresco.web.bean.repository.Node; -import org.alfresco.web.ui.repo.component.property.PropertySheetItem; -import org.alfresco.web.ui.repo.component.property.UIPropertySheet; - -/** - * Blog selector generator. - * - * @author Roy Wetherall - */ -public class BlogSelectorGenerator extends BaseComponentGenerator -{ - /** Node */ - protected Node node; - - /** Blog integration service */ - BlogIntegrationService blogIntegrationService; - - /** - * Set the blog integration service - * - * @param blogIntegrationService the blog integration service - */ - public void setBlogIntegrationService(BlogIntegrationService blogIntegrationService) - { - this.blogIntegrationService = blogIntegrationService; - } - - /** - * @see org.alfresco.web.bean.generator.IComponentGenerator#generate(javax.faces.context.FacesContext, java.lang.String) - */ - @SuppressWarnings("unchecked") - public UIComponent generate(FacesContext context, String id) - { - UIComponent component = context.getApplication().createComponent(UISelectOne.COMPONENT_TYPE); - FacesHelper.setupComponentId(context, component, id); - - // create the list of choices - UISelectItems itemsComponent = (UISelectItems)context.getApplication().createComponent("javax.faces.SelectItems"); - - itemsComponent.setValue(getBlogItems()); - - // add the items as a child component - component.getChildren().add(itemsComponent); - - return component; - } - - /** - * Gets the items to put in the drop down control using the blog integration service. - * - * @return SelectItem[] array of select items - */ - protected SelectItem[] getBlogItems() - { - List blogs = this.blogIntegrationService.getBlogIntegrationImplementations(); - SelectItem[] items = new SelectItem[blogs.size()]; - int index = 0; - for (BlogIntegrationImplementation blog : blogs) - { - items[index] = new SelectItem(blog.getName(), blog.getDisplayName()); - index ++; - } - - return items; - } - - /** - * @see org.alfresco.web.bean.generator.BaseComponentGenerator#createComponent(javax.faces.context.FacesContext, org.alfresco.web.ui.repo.component.property.UIPropertySheet, org.alfresco.web.ui.repo.component.property.PropertySheetItem) - */ - @Override - protected UIComponent createComponent(FacesContext context, UIPropertySheet propertySheet, PropertySheetItem item) { - - this.node = propertySheet.getNode(); - - return super.createComponent(context, propertySheet, item); - } -} diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/PostBlogEvaluator.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/PostBlogEvaluator.java deleted file mode 100644 index 88f00b5301..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/PostBlogEvaluator.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import javax.faces.context.FacesContext; - -import org.alfresco.model.BlogIntegrationModel; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.blogIntegration.BlogIntegrationService; -import org.alfresco.repo.blogIntegration.BlogIntegrationServiceImpl; -import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.service.cmr.repository.ContentService; -import org.alfresco.web.action.evaluator.BaseActionEvaluator; -import org.alfresco.web.bean.repository.Node; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.jsf.FacesContextUtils; - - -/** - * Post blog evaluator - * - * @author Roy Wetherall - */ -public class PostBlogEvaluator extends BaseActionEvaluator implements BlogIntegrationModel -{ - /** - * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node) - */ - public boolean evaluate(Node node) - { - boolean result = false; - - // Get the conten service and the blog integration service - WebApplicationContext applicationContext = FacesContextUtils.getRequiredWebApplicationContext(FacesContext.getCurrentInstance()); - ContentService contentService = (ContentService)applicationContext.getBean("ContentService"); - BlogIntegrationService blogIntegrationService = (BlogIntegrationService)applicationContext.getBean("BlogIntegrationService"); - - // Check the mimetype of the content - ContentReader contentReader = contentService.getReader(node.getNodeRef(), ContentModel.PROP_CONTENT); - if (contentReader != null) - { - String mimetype = contentReader.getMimetype(); - if (node.hasAspect(ASPECT_BLOG_POST) == false && - BlogIntegrationServiceImpl.supportedMimetypes.contains(mimetype) == true && - blogIntegrationService.getBlogDetails(node.getNodeRef()).size() != 0) - { - result = true; - } - } - return result; - } -} diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/RemoveBlogDetailsEvaluator.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/RemoveBlogDetailsEvaluator.java deleted file mode 100644 index 0b6100115c..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/RemoveBlogDetailsEvaluator.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import org.alfresco.model.BlogIntegrationModel; -import org.alfresco.web.action.evaluator.BaseActionEvaluator; -import org.alfresco.web.bean.repository.Node; - - -/** - * Remove blog details evaluator - * - * @author Roy Wetherall - */ -public class RemoveBlogDetailsEvaluator extends BaseActionEvaluator implements BlogIntegrationModel -{ - /** - * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node) - */ - public boolean evaluate(Node node) - { - boolean result = false; - if (node.hasAspect(ASPECT_BLOG_DETAILS) == true) - { - result = true; - } - return result; - } -} diff --git a/source/java/org/alfresco/web/bean/actions/blogIntegration/UpdateBlogEvaluator.java b/source/java/org/alfresco/web/bean/actions/blogIntegration/UpdateBlogEvaluator.java deleted file mode 100644 index 1ab172b3f8..0000000000 --- a/source/java/org/alfresco/web/bean/actions/blogIntegration/UpdateBlogEvaluator.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.actions.blogIntegration; - -import org.alfresco.model.BlogIntegrationModel; -import org.alfresco.web.action.evaluator.BaseActionEvaluator; -import org.alfresco.web.bean.repository.Node; - - -/** - * Update blog evaluator - * - * @author Roy Wetherall - */ -public class UpdateBlogEvaluator extends BaseActionEvaluator implements BlogIntegrationModel -{ - /** - * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node) - */ - public boolean evaluate(Node node) - { - boolean result = false; - if (node.hasAspect(ASPECT_BLOG_POST) == true) - { - result = true; - } - return result; - } -} diff --git a/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java b/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java index 6145eafa10..0c1b01954f 100644 --- a/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java +++ b/source/java/org/alfresco/web/bean/forums/CreateDiscussionDialog.java @@ -179,6 +179,10 @@ public class CreateDiscussionDialog extends CreateTopicDialog tx = Repository.getUserTransaction(context); tx.begin(); + // remove this node from the breadcrumb if required + Node forumNode = this.navigator.getCurrentNode(); + this.browseBean.removeSpaceFromBreadcrumb(forumNode); + // remove the discussable aspect from the node we were going to discuss! // AWC-1519: removing the aspect that defines the child association now does the // cascade delete so we no longer have to delete the child explicitly @@ -186,10 +190,6 @@ public class CreateDiscussionDialog extends CreateTopicDialog // commit the transaction tx.commit(); - - // remove this node from the breadcrumb if required - Node forumNode = this.navigator.getCurrentNode(); - this.browseBean.removeSpaceFromBreadcrumb(forumNode); // clear action context this.browseBean.setActionSpace(null); diff --git a/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java b/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java index 36e6284baf..ee3b9da1de 100644 --- a/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java +++ b/source/java/org/alfresco/web/bean/forums/DeleteForumDialog.java @@ -64,20 +64,12 @@ public class DeleteForumDialog extends DeleteSpaceDialog { // find out what the parent type of the node being deleted Node node = this.browseBean.getActionSpace(); + NodeRef parent = null; ChildAssociationRef assoc = this.getNodeService().getPrimaryParent(node.getNodeRef()); if (assoc != null) { // get the parent node - NodeRef parent = assoc.getParentRef(); - - // get the association type - QName type = assoc.getTypeQName(); - if (type.equals(ForumModel.ASSOC_DISCUSSION)) - { - // if the association type is the 'discussion' association we - // need to remove the discussable aspect from the parent node - this.getNodeService().removeAspect(parent, ForumModel.ASPECT_DISCUSSABLE); - } + parent = assoc.getParentRef(); // if the parent type is a forum space then we need the dialog to go // back to the forums view otherwise it will use the default of 'browse', @@ -89,7 +81,23 @@ public class DeleteForumDialog extends DeleteSpaceDialog } } - return super.finishImpl(context, outcome); + // delete the forum itself + outcome = super.finishImpl(context, outcome); + + // remove the discussable aspect if appropriate + if (assoc != null && parent != null) + { + // get the association type + QName type = assoc.getTypeQName(); + if (type.equals(ForumModel.ASSOC_DISCUSSION)) + { + // if the association type is the 'discussion' association we + // need to remove the discussable aspect from the parent node + this.getNodeService().removeAspect(parent, ForumModel.ASPECT_DISCUSSABLE); + } + } + + return outcome; } @Override