diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index ee1204f01..3b0e14ba9 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -130,7 +130,13 @@ if (isset( $oProcessFieds['PRO_DEBUG'] ) && $oProcessFieds['PRO_DEBUG']) {
}
//cleaning debug variables
-if (! isset( $_GET['breakpoint'] )) {
+$flagExecuteBeforeTriggers = !isset($_GET["breakpoint"]);
+
+if (isset($_GET["TYPE"]) && $_GET["TYPE"] == "OUTPUT_DOCUMENT" && isset($_GET["ACTION"]) && $_GET["ACTION"] != "GENERATE") {
+ $flagExecuteBeforeTriggers = false;
+}
+
+if ($flagExecuteBeforeTriggers) {
if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) {
unset( $_SESSION['TRIGGER_DEBUG']['info'] );
}
diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js
index 9a272b7c5..481fffbbd 100755
--- a/workflow/engine/templates/cases/casesDocuments.js
+++ b/workflow/engine/templates/cases/casesDocuments.js
@@ -1739,6 +1739,16 @@ function copymoveCtx(e) {
copymove('moveExecute');
}
+var loader = new Ext.tree.TreeLoader({
+ preloadChildren : true,
+ dataUrl : '../appFolder/appFolderAjax.php',
+ baseParams : {
+ action : 'expandNode',
+ sendWhat : 'dirs',
+ renderTree : 1
+ }
+ });
+
var documentsTab = {
id : 'documents',
// title : 'Documents',
@@ -1772,15 +1782,7 @@ var documentsTab = {
}
],
// rootVisible: false,
- loader : new Ext.tree.TreeLoader({
- preloadChildren : true,
- dataUrl : '../appFolder/appFolderAjax.php',
- baseParams : {
- action : 'expandNode',
- sendWhat : 'dirs',
- renderTree : 1
- }
- }),
+ loader : loader,
containerScroll : true,
enableDD : true,
ddGroup : 'TreeDD',
@@ -1834,10 +1836,10 @@ var documentsTab = {
return true;
}
},
- 'beforenodedrop' : {
- fn : function(e) {
- dropEvent = e;
- copymoveCtx(e);
+ 'nodedrop' : {
+ fn : function(e) {
+ dropEvent = e;
+ copymoveCtx(e);
datastore.reload();
}
},
diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html
index 5b407f802..864036d8a 100644
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -82,12 +82,14 @@
diff --git a/workflow/engine/templates/oauth2/clientSetup.js b/workflow/engine/templates/oauth2/clientSetup.js
index 79ef6c783..e0f051809 100644
--- a/workflow/engine/templates/oauth2/clientSetup.js
+++ b/workflow/engine/templates/oauth2/clientSetup.js
@@ -254,7 +254,7 @@ clientSetup.application = {
data: [["20"], ["30"], ["40"], ["50"], ["100"]],
autoLoad: true
});
-
+
//Components
var winData = new Ext.Window({
layout: "fit",
@@ -289,7 +289,11 @@ clientSetup.application = {
id: "txtName",
name: "txtName",
- fieldLabel: "Name"
+ fieldLabel: "Name",
+ validator: function(value){
+ var val = (value=='')? false: true;
+ return val;
+ }
},
{
xtype: "label",
@@ -320,8 +324,15 @@ clientSetup.application = {
id: "txtWebSite",
name: "txtWebSite",
- fieldLabel: "Web Site",
- vtype: "url"
+ fieldLabel: "Web Site",
+ validator: function (value){
+ var regexpUrl = /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi;
+ var regexStringIp = new RegExp(regexpUrl);
+ var regexpIpAdress = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/g;
+ var regexNumberIp = new RegExp(regexpIpAdress);
+ var result = (value.match(regexStringIp) || value.match(regexNumberIp))? true : false;
+ return result;
+ }
},
{
xtype: "label",
@@ -345,7 +356,7 @@ clientSetup.application = {
fieldLabel: " ",
labelSeparator: "",
- html: "" + "here should we return after successfully authenticating? For @Anywhere applications, only the domain specified in the callback will be used. OAuth 1.0a applications should explicitly specify their oauth_callback URL on the request token step, regardless of the value given here. To restrict your application from using callbacks, leave this field blank." + ""
+ html: "" + "URL where redirected after successfully authenticating (calling the {workspace}/oauth2/authorize endpoint). This URL typically contains code to get the access token from the {workspace}/oauth2/token endpoint. To prevent your application from using callbacks, leave this field blank." + ""
}
]
})
@@ -499,7 +510,7 @@ clientSetup.application = {
var btnDetail = new Ext.Action({
id: "btnDetail",
- text: _("ID_DETAIL"),
+ text: _("ID_DETAILS"),
iconCls: "button_menu_ext ss_sprite ss_zoom",
handler: function ()
@@ -695,7 +706,7 @@ clientSetup.application = {
items: [grdpnlMain]
});
}
+
}
-Ext.onReady(clientSetup.application.init, clientSetup.application);
-
+Ext.onReady(clientSetup.application.init, clientSetup.application);
\ No newline at end of file
diff --git a/workflow/engine/templates/setup/main.js b/workflow/engine/templates/setup/main.js
index 4ff9ece69..0424cb71d 100755
--- a/workflow/engine/templates/setup/main.js
+++ b/workflow/engine/templates/setup/main.js
@@ -4,6 +4,8 @@
*/
var _NODE_SELECTED;
+var flagRenderTabLog = false;
+
var main = function(){
var cookiep = new Ext.state.CookieProvider();
@@ -130,7 +132,19 @@ var main = function(){
activeTab:this.items.indexOf(this.getActiveTab())
};
},
- items: items
+ items: items,
+ listeners: {
+ tabchange: function (tabpanel, tab)
+ {
+ if (tab.id == "logs" && flagRenderTabLog) {
+ tab.getLoader().load(tab.root);
+ }
+
+ if (tab.id == "logs") {
+ flagRenderTabLog = true;
+ }
+ }
+ }
}),
{
region: 'center',
@@ -166,5 +180,3 @@ new Ext.KeyMap(document, {
});
Ext.onReady(main);
-
-