From d38502221293d393496b4f60dfcd45197271ceeb Mon Sep 17 00:00:00 2001 From: Ariel Backenroth Date: Tue, 15 Aug 2006 15:28:29 +0000 Subject: [PATCH] need to pass cookies to the submission handler, otherwise content is written to the wrong xformsbean. removing the submit button. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/bean/ajax/XFormsBean.java | 11 +------ .../web/bean/content/CreateContentWizard.java | 2 -- .../create-content-wizard/create-xml.jsp | 26 ++++++++++++++++ source/web/scripts/ajax/xforms.js | 31 ++++++++++++++++++- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/source/java/org/alfresco/web/bean/ajax/XFormsBean.java b/source/java/org/alfresco/web/bean/ajax/XFormsBean.java index 8f3527f219..e9e6667dff 100644 --- a/source/java/org/alfresco/web/bean/ajax/XFormsBean.java +++ b/source/java/org/alfresco/web/bean/ajax/XFormsBean.java @@ -103,17 +103,8 @@ public class XFormsBean LOGGER.debug(this + " building xform"); final FacesContext context = FacesContext.getCurrentInstance(); final ResponseWriter out = context.getResponseWriter(); - final Map requestParameters = context.getExternalContext().getRequestParameterMap(); - // final String templateTypeName = (String)requestParameters.get("template_type_name"); - - LOGGER.debug("building xform for " + this.tt.getName()); //templateTypeName); - - // final TemplatingService ts = TemplatingService.getInstance(); - // final TemplateType tt = ts.getTemplateType(templateTypeName); - // final XFormsInputMethod tim = (XFormsInputMethod) - // tt.getInputMethods().get(0); - // final Document form = tim.getXForm(tt); + LOGGER.debug("building xform for " + this.tt.getName()); final Node form = this.chibaBean.getXMLContainer(); final TemplatingService ts = TemplatingService.getInstance(); ts.writeXML(form, out); diff --git a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java index 61d86dcfde..9f0f94ccff 100644 --- a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java +++ b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java @@ -36,7 +36,6 @@ import org.alfresco.web.bean.repository.Node; import org.alfresco.web.data.IDataContainer; import org.alfresco.web.data.QuickSort; import org.alfresco.web.templating.*; -import org.alfresco.web.bean.ajax.XFormsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,7 +45,6 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.ContentWriter; import java.io.OutputStreamWriter; import org.alfresco.web.app.servlet.FacesHelper; -import org.chiba.xml.xforms.exception.XFormsException; /** * Bean implementation for the "Create Content Wizard" dialog diff --git a/source/web/jsp/content/create-content-wizard/create-xml.jsp b/source/web/jsp/content/create-content-wizard/create-xml.jsp index 6fb42de5b5..0df82adc2b 100644 --- a/source/web/jsp/content/create-content-wizard/create-xml.jsp +++ b/source/web/jsp/content/create-content-wizard/create-xml.jsp @@ -51,3 +51,29 @@ final InstanceData instanceData = new InstanceData() { }; tim.generate(instanceData, tt, out); %> + diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js index 1ca5e87f7d..25969cff63 100644 --- a/source/web/scripts/ajax/xforms.js +++ b/source/web/scripts/ajax/xforms.js @@ -9,6 +9,30 @@ dojo.require("dojo.html.style"); dojo.hostenv.writeIncludes(); dojo.addOnLoad(xforms_init); +//dojo.provide("alfresco.xforms.textarea"); +// +//dojo.declare("alfresco.xforms.Widget", +// null, +// function(node) +// { +// this.node = node; +// }, +// id: "", +// isRequired: function() +// { +// }, +// getInitialValue: function() +// { +// }); +// +//dojo.declae("alfresco.xforms.TextArea", +// alfresco.xforms.Widget, +// function() { }, +// +//{ +// alert(element); +//} + var bindings = {}; var xform = null; function xforms_init() @@ -93,6 +117,7 @@ function load_body(body, ui_element_stack) ui_element_stack.pop(); break; case "xforms:textarea": + // new alfresco.xforms.textarea(o); var row = document.createElement("tr"); ui_element_stack[ui_element_stack.length - 1].appendChild(row); @@ -340,6 +365,9 @@ function load_body(body, ui_element_stack) caption: "submit" }, nodeRef); + w.hide(); + document.submitTrigger = w; + document.submitTrigger.done = false; w.onClick = function() { fireAction(w.widgetId); @@ -449,7 +477,8 @@ function fireAction(id) mimetype: "text/xml", load: function(type, data, evt) { - // alert("fired action " + id); + document.submitTrigger.done = true; + doSubmit(); }, error: function(type, e) {