From a0d2e45611a75774938c3c020ea32628747341ff Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Fri, 7 Mar 2008 10:32:22 +0000 Subject: [PATCH] Merged V2.2 to HEAD 7650: Merged V2.1 to V2.2 7542: ML contribution fixes 7545: Merged V2.0 to V2.1 7544: Merged V1.4 to V2.0 7338: Fix for potential time-based GUID issues 7554: Fixed imports after library package change 7582: WCM-967 7584: Fixed dependecy list for SDK for jug-lgpl-2.0.0.jar 7642: Fix for WCM-949 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web-client-config-forum-actions.xml | 18 +++++++ .../evaluator/CreateForumMLNodeEvaluator.java | 54 +++++++++++++++++++ .../web/bean/ml/MultilingualManageDialog.java | 6 ++- source/web/jsp/content/document-details.jsp | 4 +- source/web/jsp/ml/ml-container-details.jsp | 46 ++++++++++------ 5 files changed, 108 insertions(+), 20 deletions(-) create mode 100644 source/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml index 989df50985..3495e43900 100644 --- a/config/alfresco/web-client-config-forum-actions.xml +++ b/config/alfresco/web-client-config-forum-actions.xml @@ -72,6 +72,18 @@ + + + org.alfresco.web.action.evaluator.CreateForumMLNodeEvaluator + start_discussion + /images/icons/create_forum.gif + dialog:createDiscussion + #{DialogManager.setupParameters} + + #{actionContext.id} + + + @@ -231,6 +243,12 @@ + + + + + + diff --git a/source/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java b/source/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java new file mode 100644 index 0000000000..98f2b0d60c --- /dev/null +++ b/source/java/org/alfresco/web/action/evaluator/CreateForumMLNodeEvaluator.java @@ -0,0 +1,54 @@ +/* + * 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.action.evaluator; + +import javax.faces.context.FacesContext; + +import org.alfresco.model.ForumModel; +import org.alfresco.web.bean.ml.MultilingualUtils; +import org.alfresco.web.bean.repository.Node; + +/** + * UI Action Evaluator - Create a forum around a multilingual content node. + * + * @author Yanick Pignot + */ +public class CreateForumMLNodeEvaluator extends BaseActionEvaluator +{ + private static final long serialVersionUID = -8621940623410511065L; + + /** + * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node) + */ + public boolean evaluate(Node node) + { + // the current user must have enough right to add a content to the space + // where the pivot translation is located in + return MultilingualUtils.canAddChildrenToPivotSpace(node, FacesContext.getCurrentInstance()) + && node.hasAspect(ForumModel.ASPECT_DISCUSSABLE) == false + && node.isLocked() == false; + + } +} diff --git a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java index 09e2d88da7..ecb70d3623 100644 --- a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java +++ b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java @@ -262,8 +262,10 @@ public class MultilingualManageDialog extends BaseDialogBean mapNode.put("language", lgge); mapNode.put("url", DownloadContentServlet.generateBrowserURL(nodeRef, mapNode.getName())); - mapNode.put("notEmpty", new Boolean(!getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))); - mapNode.put("userHasRight", new Boolean(canNewEdtion)); + boolean isEmpty = new Boolean(getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION)); + + mapNode.put("notEmpty", !isEmpty); + mapNode.put("userHasRight", new Boolean(canNewEdtion && !isEmpty)); // add the client side version to the list translations.add(mapNode); } diff --git a/source/web/jsp/content/document-details.jsp b/source/web/jsp/content/document-details.jsp index 1416fac7d7..33b25d1f91 100644 --- a/source/web/jsp/content/document-details.jsp +++ b/source/web/jsp/content/document-details.jsp @@ -225,7 +225,7 @@ Start the new edition wizard from this translation --%> - + @@ -254,7 +254,7 @@ <%-- Action - Add Translation --%> -
+
diff --git a/source/web/jsp/ml/ml-container-details.jsp b/source/web/jsp/ml/ml-container-details.jsp index 0240b748a7..1f7e48a671 100644 --- a/source/web/jsp/ml/ml-container-details.jsp +++ b/source/web/jsp/ml/ml-container-details.jsp @@ -54,22 +54,29 @@ - - - + - + +
+ <%-- list of translations --%> - + - + <%-- Icon details view mode --%> @@ -105,7 +112,7 @@ Start the new edition wizard from this translation --%> - + @@ -113,14 +120,18 @@ +
+ <%-- Editions details --%> - + @@ -198,10 +209,13 @@
- + - + <%-- Icon details view mode --%> @@ -275,7 +289,7 @@ <%-- Document Actions --%> - +