- fixing edit form wizard to properly show when no default workflow is configured

- fixing row highlight bug in repeats when they're moved around
- attempt to fix move up move down issues for tinymce - but mce is really not behaving at all
- fix for folder icon in manage task screen, but doesn't really solve the problem that inappropriate actions are available.
- some minor fixes for create form wizard summary page.

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

source/java/org/alfresco/web/bean/wcm/AVMNode.java

@@ -28,9 +28,11 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
+import org.alfresco.web.bean.BrowseBean;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.NodePropertyResolver;
 import org.alfresco.web.config.ClientConfigElement;
+import org.alfresco.web.ui.common.Utils;
 
 /**
  * Node class representing an AVM specific Node.
@@ -91,6 +93,26 @@ public class AVMNode extends Node implements Map<String, Object>
          }
       };
 
+   public final static NodePropertyResolver RESOLVER_FILE_TYPE_16 =
+      new NodePropertyResolver()
+      {
+         public Object get(final Node node)
+         {
+            if (! (node instanceof AVMNode))
+            {
+               return null;
+            }
+            if (((AVMNode)node).isDirectory())
+            {
+               return "/images/icons/" + BrowseBean.SPACE_SMALL_DEFAULT + ".gif";
+            }
+            else
+            {
+               return Utils.getFileTypeImage(node.getName(), true);
+            }
+         }
+      };
+
 
    private AVMNodeDescriptor avmRef;
    private int version;

source/java/org/alfresco/web/bean/wcm/EditFormWizard.java

@@ -41,6 +41,8 @@ import org.alfresco.web.forms.Form;
 import org.alfresco.web.forms.FormsService;
 import org.alfresco.web.forms.RenderingEngineTemplate;
 import org.alfresco.web.ui.common.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Backing bean for the Edit Form wizard.
@@ -50,6 +52,7 @@ import org.alfresco.web.ui.common.Utils;
 public class EditFormWizard 
    extends CreateFormWizard
 {
+   private final static Log LOGGER = LogFactory.getLog(EditFormWizard.class);
 
    private List<RenderingEngineTemplateData> removedRenderingEngineTemplates;
 
@@ -97,6 +100,10 @@ public class EditFormWizard
       {
          this.defaultWorkflowName = wf.getName();
       }
+      else
+      {
+         this.applyDefaultWorkflow = false;
+      }
       this.setOutputPathPatternForFormInstanceData(form.getOutputPathPattern());
 
       for (RenderingEngineTemplate ret : form.getRenderingEngineTemplates())
@@ -127,29 +134,36 @@ public class EditFormWizard
                                    WCMAppModel.PROP_XML_SCHEMA_ROOT_ELEMENT_NAME,
                                    this.getSchemaRootElementName());
       final WorkflowDefinition wd = this.getDefaultWorkflowDefinition();
-      if (wd != null)
+      final List<ChildAssociationRef> workflowRefs = 
+         this.nodeService.getChildAssocs(formNodeRef,
+                                         WCMAppModel.ASSOC_FORM_WORKFLOW_DEFAULTS,
+                                         RegexQNamePattern.MATCH_ALL);
+
+      if (wd != null && workflowRefs.size() == 0)
       {
-         final List<ChildAssociationRef> workflowRefs = 
-            this.nodeService.getChildAssocs(formNodeRef,
-                                            WCMAppModel.ASSOC_FORM_WORKFLOW_DEFAULTS,
-                                            RegexQNamePattern.MATCH_ALL);
-         if (workflowRefs.size() == 0)
-         {
-            final Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
-            props.put(WCMAppModel.PROP_WORKFLOW_NAME, wd.getName());
-            this.nodeService.createNode(formNodeRef,
-                                        WCMAppModel.ASSOC_FORM_WORKFLOW_DEFAULTS,
-                                        WCMAppModel.ASSOC_FORM_WORKFLOW_DEFAULTS,
-                                        WCMAppModel.TYPE_WORKFLOW_DEFAULTS,
-                                        props);
-         }
-         else
-         {
-            this.nodeService.setProperty(workflowRefs.get(0).getChildRef(),
-                                         WCMAppModel.PROP_WORKFLOW_NAME,
-                                         wd.getName());
-         }              
+         LOGGER.debug("adding workflow definition " + wd.getName() + 
+                      " to form " + this.getFormName());
+         final Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
+         props.put(WCMAppModel.PROP_WORKFLOW_NAME, wd.getName());
+         this.nodeService.createNode(formNodeRef,
+                                     WCMAppModel.ASSOC_FORM_WORKFLOW_DEFAULTS,
+                                     WCMAppModel.ASSOC_FORM_WORKFLOW_DEFAULTS,
+                                     WCMAppModel.TYPE_WORKFLOW_DEFAULTS,
+                                     props);
       }
+      else if (wd != null && workflowRefs.size() == 1)
+      {
+         LOGGER.debug("setting workflow definition " + wd.getName() + 
+                      " to form " + this.getFormName());
+         this.nodeService.setProperty(workflowRefs.get(0).getChildRef(),
+                                      WCMAppModel.PROP_WORKFLOW_NAME,
+                                      wd.getName());
+      }              
+      else if (wd == null && workflowRefs.size() == 1)
+      {
+         LOGGER.debug("removing workflow definitions from form " + this.getFormName());
+         this.nodeService.removeChild(formNodeRef, workflowRefs.get(0).getChildRef());
+      }         
 
       if (this.getSchemaFile() != null)
       {

source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java

@@ -28,6 +28,7 @@ import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.web.bean.BrowseBean;
 import org.alfresco.web.bean.dialog.BaseDialogBean;
 import org.alfresco.web.bean.repository.MapNode;
 import org.alfresco.web.bean.repository.Node;
@@ -691,11 +692,15 @@ public class ManageTaskDialog extends BaseDialogBean
 
    protected void addAVMNode(final AVMNode node)
    {
-      LOGGER.debug("adding node  " + node);
       node.getProperties().put("taskId", this.task.id);
-      this.browseBean.setupCommonBindingProperties(node);
       node.addPropertyResolver("path", AVMNode.RESOLVER_SANDBOX_RELATIVE_PATH);
       node.addPropertyResolver("previewUrl", AVMNode.RESOLVER_PREVIEW_URL);
+      node.addPropertyResolver("fileType16", AVMNode.RESOLVER_FILE_TYPE_16);
+      node.addPropertyResolver("size", this.browseBean.resolverSize);
+      if (!node.isDirectory())
+      {
+         node.addPropertyResolver("url", this.browseBean.resolverUrl);
+      }
       this.resources.add(node);
    }