inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ETHREEOH-1811, ETHREEOH-866 & ETHREEOH-2226: Issue with required field nodes within optional parent node that is a complextype

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17083 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2009-10-22 10:58:34 +00:00
parent d5fa19de9f
commit fc7c241ce3
4 changed files with 168 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
View File

@@ -1283,9 +1283,10 @@ public class Schema2XForms implements Serializable
" occurs " + occurs);
// create the <xforms:bind> element and add it to the model.
boolean isRepeated = occurs.isRepeated() || (occurs.isOptional() && (controlType instanceof XSSimpleTypeDefinition == false));
final Element bindElement =
this.createBind(xformsDocument,
pathToRoot + (occurs.isRepeated() ? "[position() != last()]" : ""));
pathToRoot + (isRepeated ? "[position() != last()]" : ""));
final String bindId = bindElement.getAttributeNS(null, "id");
modelSection.appendChild(bindElement);
@@ -1715,7 +1716,7 @@ public class Schema2XForms implements Serializable
" default instance element for " + elementName +
" at path " + path);
// update the default instance
if (occurs.isRepeated())
if (occurs.isRepeated() || (occurs.isOptional() && (element.getTypeDefinition() instanceof XSSimpleTypeDefinition == false)))
{
LOGGER.debug("adding " + (occurs.minimum + 1) +
" default instance elements for " + elementName +
@@ -1758,7 +1759,8 @@ public class Schema2XForms implements Serializable
{
// add xforms:repeat section if this element re-occurs
if (o.maximum == 1)
if ((o.isOptional() && controlType instanceof XSSimpleTypeDefinition) ||
(o.maximum == 1 && o.minimum == 1))
{
return formSection;
}
@@ -1854,14 +1856,15 @@ public class Schema2XForms implements Serializable
}
// create the <xforms:bind> element and add it to the model.
boolean isRepeated = occurs.isRepeated() || (occurs.isOptional() && (controlType instanceof XSSimpleTypeDefinition == false));
Element bindElement =
this.createBind(xformsDocument, pathToRoot + (occurs.isRepeated() ? "[position() != last()]" : ""));
this.createBind(xformsDocument, pathToRoot + (isRepeated ? "[position() != last()]" : ""));
String bindId = bindElement.getAttributeNS(null, "id");
modelSection.appendChild(bindElement);
bindElement = this.startBindElement(bindElement, schema, controlType, owner, occurs);
// add a group if a repeat !
if (owner instanceof XSElementDeclaration && occurs.maximum != 1)
if (owner instanceof XSElementDeclaration && occurs.isRepeated())
{
final Element groupElement = this.createGroup(xformsDocument,
modelSection,

5
source/java/org/alfresco/web/forms/xforms/SchemaUtil.java
View File

@@ -72,6 +72,11 @@ public class SchemaUtil
return this.isUnbounded() || this.maximum > 1;
}
public boolean isOptional()
{
return this.minimum == 0 && this.maximum == 1;
}
public boolean isUnbounded()
{
return this.maximum == UNBOUNDED;