Author: xlawrence
Date: Tue Jan 10 16:59:11 2006
New Revision: 12750
URL: https://jahia.mine.nu/websvn/listing.php?sc=1&rev=12750&repname=jahia
Log:
call include tag for the Zimbra AjaxTK
some modifications in the javascript related to the showReport screen of the
WorkFlow
Modified:
trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
URL:
https://jahia.mine.nu/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/engines/engine.jsp&rev=12750&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/engines/engine.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/engine.jsp Tue Jan 10 16:59:11 2006
@@ -10,6 +10,7 @@
<%@ page import="java.util.Properties" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
+<%@ taglib uri="ajaxLib" prefix="ajax" %>
<jsp:useBean id="engineTitle" class="java.lang.String" scope="request"/>
<jsp:useBean id="jspSource" class="java.lang.String" scope="request"/>
<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
@@ -127,6 +128,8 @@
<jahia:JSTools />
+<ajax:zimbraInclude/>
+
<script type="text/javascript"
src="<%=URL%>../javascript/serverdatetime.js"></script>
<% if (request.getAttribute("org.jahia.engines.html.headers") != null) { %>
<%= (String) request.getAttribute("org.jahia.engines.html.headers") %>
@@ -229,7 +232,8 @@
var src = "<%=jspSource%>";
//alert (submittedCount + "-" + last + "-" + src);
if (submittedCount == 0) {
- if (last != "save" && src != "apply" && last != "cancel" && src
!= "close" && src != "lock") {
+ if (last != "save" && last != "cancel" && last != "showReport" &&
src != "apply" &&
+ src != "close" && src != "lock") {
sendFormCancel();
//alert ("sendFormCancel" + "-" + last + "-" + src);
}
