From ef77cd2a3ee62971d82059905c2eadbcb5cf44e9 Mon Sep 17 00:00:00 2001
From: Ariel Backenroth <bounce@alfresco.com>
Date: Thu, 21 Dec 2006 19:53:05 +0000
Subject: [PATCH] - fixing null pointer in edit form wizard - getting edit form
 to show in the action list in the content forms directory as well

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-config-actions.xml |  2 +-
 .../action/evaluator/EditFormEvaluator.java   | 19 +++----------------
 .../alfresco/web/bean/wcm/EditFormWizard.java |  7 +++++--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index bbb4a79b6d..b071c8c459 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -631,7 +631,7 @@
          <action-group id="space_browse">
             <show-link>false</show-link>
             <style-class>inlineAction</style-class>
-            
+            <action idref="edit_form"/>
             <action idref="cut_node" />
             <action idref="copy_node" />
             <action idref="details_space" />
diff --git a/source/java/org/alfresco/web/action/evaluator/EditFormEvaluator.java b/source/java/org/alfresco/web/action/evaluator/EditFormEvaluator.java
index 8a10663797..4755ea22c8 100644
--- a/source/java/org/alfresco/web/action/evaluator/EditFormEvaluator.java
+++ b/source/java/org/alfresco/web/action/evaluator/EditFormEvaluator.java
@@ -16,17 +16,10 @@
  */
 package org.alfresco.web.action.evaluator;
 
-import javax.faces.context.FacesContext;
-
 import org.alfresco.model.WCMAppModel;
-import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.web.action.ActionEvaluator;
-import org.alfresco.web.app.Application;
-import org.alfresco.web.app.servlet.FacesHelper;
-import org.alfresco.web.bean.NavigationBean;
 import org.alfresco.web.bean.repository.Node;
-import org.alfresco.web.bean.repository.Repository;
 
 /**
  * UI Action Evaluator - Edit Web Form in the Forms DataDictionary folder
@@ -38,15 +31,9 @@ public class EditFormEvaluator implements ActionEvaluator
    /**
     * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
     */
-   public boolean evaluate(Node node)
+   public boolean evaluate(final Node node)
    {
-      final FacesContext fc = FacesContext.getCurrentInstance();
-      final ServiceRegistry services = Repository.getServiceRegistry(fc);
-      final NavigationBean navigator = (NavigationBean)
-         FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);
-      // get the path to the current name - compare last element with the Website folder assoc name
-      final Node currentNode = navigator.getCurrentNode();
-      return (currentNode.hasAspect(WCMAppModel.ASPECT_FORM) &&
-              currentNode.hasPermission(PermissionService.ADD_CHILDREN));
+      return (node.hasAspect(WCMAppModel.ASPECT_FORM) &&
+              node.hasPermission(PermissionService.ADD_CHILDREN));
    }
 }
diff --git a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
index 06006dc7c6..1527bcc656 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
@@ -152,9 +152,12 @@ public class EditFormWizard
                                       fileInfo.getNodeRef());
       }
 
-      for (RenderingEngineTemplateData retd : this.removedRenderingEngineTemplates)
+      if (this.removedRenderingEngineTemplates != null)
       {
-         this.nodeService.removeChild(formNodeRef, retd.getNodeRef());
+         for (RenderingEngineTemplateData retd : this.removedRenderingEngineTemplates)
+         {
+            this.nodeService.removeChild(formNodeRef, retd.getNodeRef());
+         }
       }
 
       for (RenderingEngineTemplateData retd : this.renderingEngineTemplates)