Merged V2.1 to HEAD

6383: ML contributions
   6400: AR-1625 Empty translations track pivot translation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/action/evaluator/AddTranslationEvaluator.java

@@ -15,11 +15,11 @@
  * 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: 
+ * 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;
@@ -31,36 +31,58 @@ import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.web.action.ActionEvaluator;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.UserPreferencesBean;
+import org.alfresco.web.bean.ml.MultilingualUtils;
 import org.alfresco.web.bean.repository.Node;
 
 /**
- * Evaluates whether the Add Translation (with or without content) action should be visible. 
- * 
- * If the node is not already Multilingual, locked, or if a translation exists for each available 
+ * Evaluates whether the Add Translation (with or without content) action should be visible.
+ *
+ * If the node is not already Multilingual, locked, or if a translation exists for each available
  * filter language, don't allow the action.
- * 
+ *
+ * The current user can add a translation to a translation set only if he has enough right to add
+ * a content to the space where the pivot translation is located in.
+ *
  * @author Yannick Pignot
  */
 public class AddTranslationEvaluator implements ActionEvaluator
 {
    public boolean evaluate(Node node)
    {
-      FacesContext fc = FacesContext.getCurrentInstance();
+      boolean isNodeMultililingal = node.hasAspect(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
+      boolean isMLContainer = node.getType().equals(ContentModel.TYPE_MULTILINGUAL_CONTAINER);
 
-      MultilingualContentService mlservice = 
-         (MultilingualContentService) FacesHelper.getManagedBean(fc, "MultilingualContentService");
+      // the node must be multiligual (translation or ml container)
+      if(isNodeMultililingal || isMLContainer)
+      {
+          FacesContext fc = FacesContext.getCurrentInstance();
 
-      UserPreferencesBean userprefs = 
-         (UserPreferencesBean) FacesHelper.getManagedBean(fc, "UserPreferencesBean");
+          // the current user must have enough right to add a content to the space
+          // where the pivot translation is located in
+          if(MultilingualUtils.canAddChildrenToPivotSpace(node, fc))
+          {
+              MultilingualContentService mlservice =
+                  (MultilingualContentService) FacesHelper.getManagedBean(fc, "MultilingualContentService");
 
-      // the number of translation of this document 
-      int availableTranslationCount    = mlservice.getTranslations(node.getNodeRef()).size();
-      // the total number of available languages for the translation
-      int contentFilterLanguagesCount  = userprefs.getContentFilterLanguages(false).length;
+               UserPreferencesBean userprefs =
+                  (UserPreferencesBean) FacesHelper.getManagedBean(fc, "UserPreferencesBean");
 
-      return (node.isLocked() == false &&
-              node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false &&
-              node.hasAspect(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT) == true &&
-              availableTranslationCount < contentFilterLanguagesCount);
+               // the number of translation of this document
+               int availableTranslationCount    = mlservice.getTranslations(node.getNodeRef()).size();
+               // the total number of available languages for the translation
+               int contentFilterLanguagesCount  = userprefs.getContentFilterLanguages(false).length;
+
+               // the number of translation must be < to the total number of available language for the content filter
+               return (availableTranslationCount < contentFilterLanguagesCount);
+          }
+          else
+          {
+              return false;
+          }
+      }
+      else
+      {
+         return false;
+      }
    }
 }

source/java/org/alfresco/web/action/evaluator/CutNodeEvaluator.java

@@ -15,35 +15,50 @@
  * 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: 
+ * 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.ContentModel;
 import org.alfresco.web.action.ActionEvaluator;
+import org.alfresco.web.bean.ml.MultilingualUtils;
 import org.alfresco.web.bean.repository.Node;
 
 /**
- * Evaluates whether the Cut Node action should be visible. 
- * 
- * Among all available operations over non-multilingual documents (i.e. copy, 
- * delete, start discussion, etc), there is a missing one: <b>Move</b>.  
- * Translations cannot be moved due to the exiting link it has with the logical 
- * document. Despite it is technically achievable, it could be functionally 
- * troublesome. Spreading translations of the same semantic message among several 
+ * Evaluates whether the Cut Node action should be visible.
+ *
+ * Among all available operations over non-multilingual documents (i.e. copy,
+ * delete, start discussion, etc), there is a missing one: <b>Move</b>.
+ * Translations cannot be moved due to the exiting link it has with the logical
+ * document. Despite it is technically achievable, it could be functionally
+ * troublesome. Spreading translations of the same semantic message among several
  * spaces could lead to confusion and problems.
- *  
+ *
+ * If the node to move is a mlContainer, the user must have enough right to delete each translation
+ *
  * @author Yannick Pignot
  */
 public class CutNodeEvaluator implements ActionEvaluator
 {
    public boolean evaluate(Node node)
    {
+
+      FacesContext fc = FacesContext.getCurrentInstance();
+
+      // the node to delete is a ml container, test if the user has enought right on each translation
+      if(node.getType().equals(ContentModel.TYPE_MULTILINGUAL_CONTAINER))
+      {
+          return MultilingualUtils.canMoveEachTranslation(node, fc);
+      }
+
+
       boolean eval = true;
 
       // impossible to cut/copy a translation without content.
@@ -53,9 +68,9 @@ public class CutNodeEvaluator implements ActionEvaluator
       }
       else
       {
-         eval = !node.getAspects().contains(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);               
+         eval = !node.getAspects().contains(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
       }
-      
-      return eval; 
+
+      return eval;
    }
 }

source/java/org/alfresco/web/action/evaluator/DeleteDocEvaluator.java

@@ -15,11 +15,11 @@
  * 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: 
+ * 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;
@@ -30,11 +30,12 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.web.action.ActionEvaluator;
 import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.web.bean.ml.MultilingualUtils;
 import org.alfresco.web.bean.repository.Node;
 
 /**
  * UI Action Evaluator - Delete document.
- * 
+ *
  * @author Kevin Roast
  */
 public class DeleteDocEvaluator implements ActionEvaluator
@@ -44,14 +45,20 @@ public class DeleteDocEvaluator implements ActionEvaluator
     */
    public boolean evaluate(Node node)
    {
+      FacesContext fc = FacesContext.getCurrentInstance();
+
+      // the node to delete is a ml container, test if the user has enought right on each translation
+      if(node.getType().equals(ContentModel.TYPE_MULTILINGUAL_CONTAINER))
+      {
+          return MultilingualUtils.canDeleteEachTranslation(node, fc);
+      }
+
       boolean isPivot = false;
 
       // special case for multilingual documents
       if (node.getAspects().contains(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT))
       {
-         FacesContext fc = FacesContext.getCurrentInstance();
-
-         MultilingualContentService mlservice = 
+         MultilingualContentService mlservice =
             (MultilingualContentService) FacesHelper.getManagedBean(fc, "MultilingualContentService");
 
          // if the translation is the last translation, user can delete it
@@ -67,7 +74,7 @@ public class DeleteDocEvaluator implements ActionEvaluator
          }
          // finally, the node is not the pivot translation, user can delete it
       }
-      
+
       return (node.isLocked() == false &&
               node.hasAspect(ContentModel.ASPECT_WORKING_COPY) == false &&
               isPivot == false);

source/java/org/alfresco/web/action/evaluator/NewEditionEvaluator.java

@@ -0,0 +1,48 @@
+/*
+ * 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.web.action.ActionEvaluator;
+import org.alfresco.web.bean.ml.MultilingualUtils;
+import org.alfresco.web.bean.repository.Node;
+
+/**
+ * Evaluates whether the new edition wizard action should be visible.
+ *
+ * The creation of a new edtion implies the deletion of each translation and the creation
+ * of new content in the space
+ *
+ * @author Yanick Pignot
+ */
+public class NewEditionEvaluator implements ActionEvaluator
+{
+   public boolean evaluate(Node node)
+   {
+       FacesContext fc = FacesContext.getCurrentInstance();
+       return MultilingualUtils.canStartNewEditon(node, fc);
+   }
+}