+
+
+
+
+
+
+
+
+
+
+
+ " onclick="closeDialog()"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " onclick="validateField()"/>
+ " onclick="closeDialog()"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " onclick="validateField()"/>
+ " onclick="closeDialog()"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " onclick="validateField()"/>
+ " onclick="closeDialog()"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " onclick="validateField()"/>
+ " onclick="closeDialog()"/>
+
+
+
+
+
+
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/builder.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/builder.jsp
index 968464bf00..f85e166486 100755
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/builder.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/builder.jsp
@@ -1,209 +1,219 @@
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
-
-<%
- String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
- pageContext.setAttribute("rightToLeft", rightToLeft);
-%>
-
-
-
-
-
-
-
: -
-
-
-
-
-
-
-
-
-
- ">
- ">
-
-
-
" />
-
-
-
- ">
-
-
-
">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="org.joget.workflow.util.WorkflowUtil"%>
+
+<%
+ String rightToLeft = WorkflowUtil.getSystemSetupValue("rightToLeft");
+ pageContext.setAttribute("rightToLeft", rightToLeft);
+%>
+
+
+
+
+
+
+
: -
+
+
+
+
+
+
+
+
+
+ ">
+ ">
+
+
+
" />
+
+
+
+ ">
+
+
+
">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error403.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error403.jsp
index 183a7ffa74..1b8625a954 100755
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error403.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error403.jsp
@@ -1,30 +1,30 @@
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ page isErrorPage="true" %>
-<%@ page import="java.util.Locale,org.springframework.web.servlet.support.RequestContextUtils,org.joget.commons.util.ResourceBundleUtil" %>
-<% Locale locale = RequestContextUtils.getLocale(request); %>
-
-
-
-
-
<%= ResourceBundleUtil.getMessage("console.header.top.title", locale) %>
-
-
-
-
-
-
-
-
-

-
-
-
-
- <%= ResourceBundleUtil.getMessage("general.error.error403Description", locale) %>
-
-
- <%= ResourceBundleUtil.getMessage("general.error.error403", locale) %>
-
-
-
-
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<%@ page import="java.util.Locale,org.springframework.web.servlet.support.RequestContextUtils,org.joget.commons.util.ResourceBundleUtil" %>
+<% Locale locale = RequestContextUtils.getLocale(request); %>
+
+
+
+
+
<%= ResourceBundleUtil.getMessage("console.header.top.title", locale) %>
+
+
+
+
+
+
+
+
+

+
+
+
+
+ <%= ResourceBundleUtil.getMessage("general.error.error403Description", locale) %>
+
+
+ <%= ResourceBundleUtil.getMessage("general.error.error403", locale) %>
+
+
+
+
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error404.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error404.jsp
index 5f6c490ece..029ce61e14 100755
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error404.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error404.jsp
@@ -1,30 +1,30 @@
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ page isErrorPage="true" %>
-<%@ page import="java.util.Locale,org.springframework.web.servlet.support.RequestContextUtils,org.joget.commons.util.ResourceBundleUtil" %>
-<% Locale locale = RequestContextUtils.getLocale(request); %>
-
-
-
-
-
<%= ResourceBundleUtil.getMessage("console.header.top.title", locale) %>
-
-
-
-
-
-
-
-
-

-
-
-
-
- <%= ResourceBundleUtil.getMessage("general.error.error404", locale) %>
-
-
- <%= ResourceBundleUtil.getMessage("general.error.error404Description", locale) %>
-
-
-
-
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<%@ page import="java.util.Locale,org.springframework.web.servlet.support.RequestContextUtils,org.joget.commons.util.ResourceBundleUtil" %>
+<% Locale locale = RequestContextUtils.getLocale(request); %>
+
+
+
+
+
<%= ResourceBundleUtil.getMessage("console.header.top.title", locale) %>
+
+
+
+
+
+
+
+
+

+
+
+
+
+ <%= ResourceBundleUtil.getMessage("general.error.error404", locale) %>
+
+
+ <%= ResourceBundleUtil.getMessage("general.error.error404Description", locale) %>
+
+
+
+
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error500.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error500.jsp
index fcb37c6ec8..80fb3a135c 100755
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error500.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/error500.jsp
@@ -1,49 +1,49 @@
-<%@ page isErrorPage="true" %>
-<%@ page import="java.util.Date"%>
-<%@ page import="org.joget.commons.util.LogUtil"%>
-<%@ page import="org.joget.commons.util.ResourceBundleUtil"%>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ page import="java.util.Locale,org.springframework.web.servlet.support.RequestContextUtils,org.joget.commons.util.ResourceBundleUtil" %>
-<% Locale locale = RequestContextUtils.getLocale(request); %>
-
-<%
-try {
- LogUtil.error(getClass().getName(), exception, exception.getMessage());
-} catch(Throwable t) {
- // ignore
-}
-%>
-
-
-
-
-
<%= ResourceBundleUtil.getMessage("console.header.top.title", locale) %>
-
-
-
-
-
-
-
-
-

-
-
-
-
- <%= ResourceBundleUtil.getMessage("general.error.error500", locale) %>
-
-
- <%= ResourceBundleUtil.getMessage("general.error.error500Description", locale) %>
-
-
- - <%= ResourceBundleUtil.getMessage("console.footer.label.revision") %>
- - <%= ResourceBundleUtil.getMessage("general.error.url", locale) %>: ${pageContext.errorData.requestURI}
- - <%= ResourceBundleUtil.getMessage("general.error.date", locale) %>:
- <%= ResourceBundleUtil.getMessage("general.error.errorDetails", locale) %>
-
-
-
-
-
-
+<%@ page isErrorPage="true" %>
+<%@ page import="java.util.Date"%>
+<%@ page import="org.joget.commons.util.LogUtil"%>
+<%@ page import="org.joget.commons.util.ResourceBundleUtil"%>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ page import="java.util.Locale,org.springframework.web.servlet.support.RequestContextUtils,org.joget.commons.util.ResourceBundleUtil" %>
+<% Locale locale = RequestContextUtils.getLocale(request); %>
+
+<%
+try {
+ LogUtil.error(getClass().getName(), exception, exception.getMessage());
+} catch(Throwable t) {
+ // ignore
+}
+%>
+
+
+
+
+
<%= ResourceBundleUtil.getMessage("console.header.top.title", locale) %>
+
+
+
+
+
+
+
+
+

+
+
+
+
+ <%= ResourceBundleUtil.getMessage("general.error.error500", locale) %>
+
+
+ <%= ResourceBundleUtil.getMessage("general.error.error500Description", locale) %>
+
+
+ - <%= ResourceBundleUtil.getMessage("console.footer.label.revision") %>
+ - <%= ResourceBundleUtil.getMessage("general.error.url", locale) %>: ${pageContext.errorData.requestURI}
+ - <%= ResourceBundleUtil.getMessage("general.error.date", locale) %>:
+ <%= ResourceBundleUtil.getMessage("general.error.errorDetails", locale) %>
+
+
+
+
+
+
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/formBuilder.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/formBuilder.jsp
index 4fe1dc7065..4664ef62c7 100755
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/formBuilder.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/fbuilder/formBuilder.jsp
@@ -90,6 +90,17 @@
};
$(document).ready(function() {
+ let lockSocket = new WebSocket(((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.host + '${pageContext.request.contextPath}/web/websocket/app/
/${appDefinition.version}/plugin/org.kecak.apps.app.lib.UrlLockSocket');
+
+ lockSocket.onmessage = function(event) {
+ let text = event.data;
+ if(text) {
+ alert(text);
+ }
+ };
+
+ lockSocket.onopen = () => lockSocket.send('/web/fbuilder/app/
/${appDefinition.version}/form/
');
+
// initialize the form
FormBuilder.appId = '
';
FormBuilder.appVersion = '
';
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp
index a06ef052e3..05d54ce67c 100755
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp
@@ -1,10 +1,10 @@
-<% response.setHeader("Cache-Control","no-cache, no-store"); %>
-<% response.setContentType("text/html;charset=UTF-8"); %>
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib tagdir="/WEB-INF/tags/ui" prefix="ui" %>
-<%@ taglib tagdir="/WEB-INF/tags/commons" prefix="commons" %>
+<% response.setHeader("Cache-Control","no-cache, no-store"); %>
+<% response.setContentType("text/html;charset=UTF-8"); %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib tagdir="/WEB-INF/tags/ui" prefix="ui" %>
+<%@ taglib tagdir="/WEB-INF/tags/commons" prefix="commons" %>
diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/pbuilder/pviewer.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/pbuilder/pviewer.jsp
index ff04cb71f1..4c22d8dd67 100644
--- a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/pbuilder/pviewer.jsp
+++ b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/pbuilder/pviewer.jsp
@@ -36,6 +36,89 @@
-