Author: michiel Date: 2010-03-04 12:51:34 +0100 (Thu, 04 Mar 2010) New Revision: 41259
Modified: mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx Log: Made better distinction between autosubmit and not. Autosubmitting seemed to be broken. Modified: mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx =================================================================== --- mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx 2010-03-04 11:50:53 UTC (rev 41258) +++ mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/save.jspx 2010-03-04 11:51:34 UTC (rev 41259) @@ -1,52 +1,66 @@ -<mm:cloud - method="asis" +<jsp:root version="2.0" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate" - xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" - > + xmlns:mm-srt="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/" + xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"> <jsp:output omit-xml-declaration="true" /> <jsp:directive.include file="parameters.jspf" /> + <mm:locale language="${parameters.language}"> + <mm:cloud + method="asis"> - <!-- - xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/" + <div class="saveresult" id="${parameters.rid}"> - --> - <div class="saveresult" id="${parameters.rid}"> - <mm:relatednodescontainer clone="parameters.query"> - <mm:relatednodes usetransaction="true" commitonclose="false"> - <mm:import id="formtagid"> - <c:choose> - <c:when test="${empty parameters.formtag}">node${_node}</c:when> - <c:otherwise>${parameters.formtag}</c:otherwise> - </c:choose> - </mm:import> - <span>${formtagid}</span> - <mm:form name="${formtagid}" commitonclose="false"> - <mm:import id="fieldlistid">${parameters.fieldlistidprefix}_<mm:escape escape="identifier">${_node}</mm:escape></mm:import> - <mm:include page="${parameters.item}" - referids="rid,fieldlistid"> - <mm:param name="reload">true</mm:param> - </mm:include> + <c:choose> + <c:when test="${parameters.autosubmit}"> + <mm:import id="formtagid"> + <c:choose> + <c:when test="${empty parameters.formtag}">node${_node}</c:when> + <c:otherwise>${parameters.formtag}</c:otherwise> + </c:choose> + </mm:import> + <span>${formtagid}</span> + <mm:form name="${formtagid}"> - <c:if test="${parameters.autosubmit}"> - <mm:valid> - <mm:log level="debug">Submitting form</mm:log> - <mm:commit /> - </mm:valid> - <span class="status"> - <mm:valid inverse="true"> - <mm:cancel /> - <mm:log level="debug">Form not valid</mm:log> - <jsp:text>Form not valid</jsp:text> + <mm:relatednodescontainer clone="parameters.query"> + <mm:relatednodes usetransaction="${! parameters.autosubmit}" commitonclose="false"> + <mm:import id="fieldlistid">${parameters.fieldlistidprefix}_<mm:escape escape="identifier">${_node}</mm:escape></mm:import> + <mm:node number="${_node.number}"> <!-- put it in this new transaction --> + <mm:include page="${parameters.item}" + referids="rid,fieldlistid"> + <mm:param name="reload">true</mm:param> + </mm:include> + </mm:node> + </mm:relatednodes> + </mm:relatednodescontainer> + <mm:valid> + <mm:log level="service">Submitting form ${formtagid}</mm:log> + <mm:commit /> </mm:valid> - </span> - </c:if> - </mm:form> - </mm:relatednodes> - </mm:relatednodescontainer> - - - </div> -</mm:cloud> + <span class="status"> + <mm:valid inverse="true"> + <mm:cancel /> + <mm:log level="service">Form not valid</mm:log> + <jsp:text>Form not valid</jsp:text> + </mm:valid> + </span> + </mm:form> + </c:when> + <c:otherwise> + <mm:relatednodescontainer clone="parameters.query"> + <mm:relatednodes usetransaction="${! parameters.autosubmit}" commitonclose="false"> + <mm:import id="fieldlistid">${parameters.fieldlistidprefix}_<mm:escape escape="identifier">${_node}</mm:escape></mm:import> + <mm:include page="${parameters.item}" + referids="rid,fieldlistid"> + <mm:param name="reload">true</mm:param> + </mm:include> + </mm:relatednodes> + </mm:relatednodescontainer> + </c:otherwise> + </c:choose> + </div> + </mm:cloud> + </mm:locale> +</jsp:root> \ No newline at end of file _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs