Association and Category Pickers (experimental)

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

source/java/org/alfresco/repo/forms/processor/NodeHandler.java

@@ -262,15 +262,6 @@ public class NodeHandler extends AbstractHandler
                 else
                 {
                     // look for association defined for the type
-                    AssociationDefinition assocDef = assocDefs.get(fullQName);
-                    if (assocDef != null)
-                    {
-                        // generate the association field
-                        generateAssociationField(assocDef, 
-                                    this.nodeService.getTargetAssocs(nodeRef, fullQName), form);
-                    }
-                    else
-                    {
                     ChildAssociationDefinition childAssocDef = childAssocDefs.get(fullQName);
                     if (childAssocDef != null)
                     {
@@ -280,6 +271,15 @@ public class NodeHandler extends AbstractHandler
                                     this.nodeService.getChildAssocs(nodeRef), form);
                     }
                     else
+                    {
+                        AssociationDefinition assocDef = assocDefs.get(fullQName);
+                        if (assocDef != null)
+                        {
+                            // generate the association field
+                            generateAssociationField(assocDef, 
+                                        this.nodeService.getTargetAssocs(nodeRef, fullQName), form);
+                        }
+                        else
                         {
                             // still not found the field, is it a force'd field?
                             if (forcedFields != null && forcedFields.size() > 0 && 

source/java/org/alfresco/repo/jscript/ScriptNode.java

@@ -308,6 +308,14 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
         return getQNameType().toString();
     }
 
+    /**
+     * @return Returns the type in short format.
+     */
+    public String getTypeShort()
+    {
+        return this.getShortQName(getQNameType());
+    }
+
     /**
      * @return Helper to return the 'name' property for the node
      */

source/java/org/alfresco/repo/template/TemplateNode.java

@@ -177,6 +177,14 @@ public class TemplateNode extends BasePermissionsNode implements NamespacePrefix
         return type;
     }
 
+    /**
+     * @return Returns the type in short format.
+     */
+    public String getTypeShort()
+    {
+        return this.getType().toPrefixString(this.services.getNamespaceService());
+    }
+
     /**
      * @return The display name for the node
      */