Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[XForms] Fix required check for partial submissions. Bug 331961, r=aaronr+smaug

Browse Source
This commit is contained in:
allan%beaufour.dk 2006-03-29 07:37:17 +00:00
parent 209577ded2
commit d73fb3d92a
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
extensions/xforms/nsXFormsSubmissionElement.cpp
View File

@ -757,7 +757,9 @@ nsXFormsSubmissionElement::SerializeData(nsIDOMNode *data,
// Ensure the data is valid and required nodes are non-empty
// This is handled directly within SerializeDataXML()
nsresult rv = CanSubmit(data);
nsCOMPtr<nsIModelElementPrivate> model = GetModel();
NS_ENSURE_STATE(model);
nsresult rv = CanSubmit(data, model, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
if (mFormat & ENCODING_URL)
@ -1205,8 +1207,10 @@ nsXFormsSubmissionElement::CreateSubmissionDoc(nsIDOMNode *source,
startNode = source;
}
nsresult rv = CopyChildren(startNode, doc, doc, attachments, cdataElements,
indent, 0);
nsCOMPtr<nsIModelElementPrivate> model = GetModel();
NS_ENSURE_STATE(model);
nsresult rv = CopyChildren(model, startNode, doc, doc, attachments,
cdataElements, indent, 0);
NS_ENSURE_SUCCESS(rv, rv);
NS_ADDREF(*result = doc);
@ -1214,14 +1218,14 @@ nsXFormsSubmissionElement::CreateSubmissionDoc(nsIDOMNode *source,
}
nsresult
nsXFormsSubmissionElement::CopyChildren(nsIDOMNode *source, nsIDOMNode *dest,
nsXFormsSubmissionElement::CopyChildren(nsIModelElementPrivate* model,
nsIDOMNode *source, nsIDOMNode *dest,
nsIDOMDocument *destDoc,
SubmissionAttachmentArray *attachments,
const nsString &cdataElements,
PRBool indent, PRUint32 depth)
{
nsCOMPtr<nsIDOMNode> currentNode(source), node, destChild;
nsCOMPtr<nsIModelElementPrivate> model = GetModel();
while (currentNode)
{
@ -1347,12 +1351,17 @@ nsXFormsSubmissionElement::CopyChildren(nsIDOMNode *source, nsIDOMNode *dest,
nsCOMPtr<nsIDOMNode> startNode;
currentNode->GetFirstChild(getter_AddRefs(startNode));
nsresult rv = CopyChildren(startNode, destChild, destDoc, attachments,
cdataElements, indent, depth + 1);
nsresult rv = CopyChildren(model, startNode, destChild, destDoc,
attachments, cdataElements, indent,
depth + 1);
NS_ENSURE_SUCCESS(rv, rv);
}
}
if (!depth) {
break;
}
currentNode->GetNextSibling(getter_AddRefs(node));
currentNode.swap(node);
}
@ -1360,15 +1369,15 @@ nsXFormsSubmissionElement::CopyChildren(nsIDOMNode *source, nsIDOMNode *dest,
}
nsresult
nsXFormsSubmissionElement::CanSubmit(nsIDOMNode *aTopNode)
nsXFormsSubmissionElement::CanSubmit(nsIDOMNode *aTopNode,
nsIModelElementPrivate *aModel,
PRBool aCheckSiblings)
{
nsCOMPtr<nsIDOMNode> currentNode(aTopNode), node;
nsCOMPtr<nsIModelElementPrivate> model = GetModel();
NS_ENSURE_STATE(model);
while (currentNode) {
PRUint16 handleNodeResult;
model->HandleInstanceDataNode(currentNode, &handleNodeResult);
aModel->HandleInstanceDataNode(currentNode, &handleNodeResult);
/*
* SUBMIT_SERIALIZE_NODE - node is to be serialized
@ -1381,9 +1390,8 @@ nsXFormsSubmissionElement::CanSubmit(nsIDOMNode *aTopNode)
currentNode->GetNextSibling(getter_AddRefs(node));
currentNode.swap(node);
continue;
} else if (
handleNodeResult ==
nsIModelElementPrivate::SUBMIT_ABORT_SUBMISSION) {
} else if (handleNodeResult ==
nsIModelElementPrivate::SUBMIT_ABORT_SUBMISSION) {
// abort
return NS_ERROR_ABORT;
@ -1396,9 +1404,13 @@ nsXFormsSubmissionElement::CanSubmit(nsIDOMNode *aTopNode)
nsCOMPtr<nsIDOMNode> firstChild;
currentNode->GetFirstChild(getter_AddRefs(firstChild));
nsresult rv = CanSubmit(firstChild);
nsresult rv = CanSubmit(firstChild, aModel);
NS_ENSURE_SUCCESS(rv, rv);
if (!aCheckSiblings) {
break;
}
currentNode->GetNextSibling(getter_AddRefs(node));
currentNode.swap(node);
}

13
extensions/xforms/nsXFormsSubmissionElement.h
View File

@ -105,7 +105,7 @@ public:
NS_HIDDEN_(nsresult) SerializeData(nsIDOMNode *data, nsCString &uri, nsIInputStream **, nsCString &contentType);
NS_HIDDEN_(nsresult) SerializeDataXML(nsIDOMNode *data, nsIInputStream **, nsCString &contentType, SubmissionAttachmentArray *);
NS_HIDDEN_(nsresult) CreateSubmissionDoc(nsIDOMNode *source, const nsString &encoding, SubmissionAttachmentArray *, nsIDOMDocument **result);
NS_HIDDEN_(nsresult) CopyChildren(nsIDOMNode *source, nsIDOMNode *dest, nsIDOMDocument *destDoc, SubmissionAttachmentArray *, const nsString &cdataElements, PRBool indent, PRUint32 depth);
NS_HIDDEN_(nsresult) CopyChildren(nsIModelElementPrivate* model, nsIDOMNode *source, nsIDOMNode *dest, nsIDOMDocument *destDoc, SubmissionAttachmentArray *, const nsString &cdataElements, PRBool indent, PRUint32 depth);
NS_HIDDEN_(nsresult) SerializeDataURLEncoded(nsIDOMNode *data, nsCString &uri, nsIInputStream **, nsCString &contentType);
NS_HIDDEN_(void) AppendURLEncodedData(nsIDOMNode *data, const nsCString &sep, nsCString &buf);
NS_HIDDEN_(nsresult) SerializeDataMultipartRelated(nsIDOMNode *data, nsIInputStream **, nsCString &contentType);
@ -142,12 +142,15 @@ private:
* model->HandleInstanceDataNode()that ensures that the instance is valid,
* required conditions met...if so, then can submit.
*
* @param aTopNode Root instance node of tree to be evaluated
* @return NS_ERROR_ABORT if instance is not valid and empty
* required nodes, otherwise return NS_OK.
* @param aTopNode Root instance node of tree to be evaluated
* @param aModel The model for the submission
* @param aCheckSiblings Check siblings too?
* @return NS_ERROR_ABORT if instance is not valid and empty
* required nodes, otherwise return NS_OK.
*
*/
nsresult CanSubmit(nsIDOMNode *aTopNode);
nsresult CanSubmit(nsIDOMNode *aTopNode, nsIModelElementPrivate *aModel,
PRBool aCheckSiblings = PR_TRUE);
/**
* Send xforms-submit-done/-error, depending on |aSucceeded|