From ef06f292191babc955b5044ea2c3e9d9d092a27e Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Fri, 17 Feb 2006 18:06:00 +0000 Subject: [PATCH] . Added NodeEventListener calls to BrowseBean setActionSpace() and setDocument() methods - Allows code "extensions" to the web-client such as Forums and TaskList to no longer add code directly to existing managed beans DocumentDetailsBean or SpaceDetailsBean - Also as a side-effect nicely fixes an unreported bug where the CheckIn action in the Document Details page was not correctly using the forums specific CheckIn resolver git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/BrowseBean.java | 8 ++++++++ .../org/alfresco/web/bean/DocumentDetailsBean.java | 10 ---------- .../java/org/alfresco/web/bean/SpaceDetailsBean.java | 9 --------- source/web/jsp/dialog/document-details.jsp | 4 ++-- source/web/jsp/dialog/space-details.jsp | 4 ++-- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java index 2f8dda798f..1510935c6c 100644 --- a/source/java/org/alfresco/web/bean/BrowseBean.java +++ b/source/java/org/alfresco/web/bean/BrowseBean.java @@ -229,6 +229,10 @@ public class BrowseBean implements IContextListener */ public void setActionSpace(Node actionSpace) { + for (NodeEventListener listener : getNodeEventListeners()) + { + listener.created(actionSpace, actionSpace.getType()); + } this.actionSpace = actionSpace; } @@ -245,6 +249,10 @@ public class BrowseBean implements IContextListener */ public void setDocument(Node document) { + for (NodeEventListener listener : getNodeEventListeners()) + { + listener.created(document, document.getType()); + } this.document = document; } diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java index f0aca12f1a..151742098b 100644 --- a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java +++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java @@ -21,7 +21,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -32,7 +31,6 @@ import javax.transaction.UserTransaction; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; -import org.alfresco.model.ForumModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.lock.LockService; import org.alfresco.service.cmr.repository.ContentData; @@ -227,14 +225,6 @@ public class DocumentDetailsBean return getDocument().hasAspect(ContentModel.ASPECT_INLINEEDITABLE); } - /** - * @return true if the Document has a discussion attached to it - */ - public boolean isBeingDiscussed() - { - return getDocument().hasAspect(ForumModel.ASPECT_DISCUSSABLE); - } - /** * Returns a list of objects representing the versions of the * current document diff --git a/source/java/org/alfresco/web/bean/SpaceDetailsBean.java b/source/java/org/alfresco/web/bean/SpaceDetailsBean.java index df87166316..d0ae8cd24d 100644 --- a/source/java/org/alfresco/web/bean/SpaceDetailsBean.java +++ b/source/java/org/alfresco/web/bean/SpaceDetailsBean.java @@ -29,7 +29,6 @@ import javax.faces.model.SelectItem; import javax.transaction.UserTransaction; import org.alfresco.model.ContentModel; -import org.alfresco.model.ForumModel; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -155,14 +154,6 @@ public class SpaceDetailsBean return getSpace().getName(); } - /** - * @return true if the Space has a discussion attached to it - */ - public boolean isBeingDiscussed() - { - return getSpace().hasAspect(ForumModel.ASPECT_DISCUSSABLE); - } - /** * Returns the WebDAV URL for the current space * diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp index 6c8e15c628..809224c56f 100644 --- a/source/web/jsp/dialog/document-details.jsp +++ b/source/web/jsp/dialog/document-details.jsp @@ -176,12 +176,12 @@ <%-- discussion --%> - + - + diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp index e496f906b6..d13cfa05fe 100644 --- a/source/web/jsp/dialog/space-details.jsp +++ b/source/web/jsp/dialog/space-details.jsp @@ -121,12 +121,12 @@ - + - +