From 188767b7bb136289a9c1c70244b2f75db599c2ef Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Thu, 16 Oct 2014 17:43:04 -0400 Subject: [PATCH 1/2] BUG 240 "The character + character..." SOLVED - The character "+" character becomes " " (space) in the title of the task - Problema resuelto, cuando se selecciona "properties" de un "task", en el tab "Definition" al insertar en el titulo el caracter "+" no se mostraba, se valida el caracter ahora se muestra correctamente. --- workflow/engine/js/processmap/core/processes_Map.js | 7 ++++++- workflow/engine/methods/tasks/tasks_Ajax.php | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index fc5d52f21..337eb60f3 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -240,6 +240,10 @@ var saveTaskData = function(oForm, iForm, iType) return false; } + oTaskData.TAS_TITLE_BK = oTaskData.TAS_TITLE; + oTaskData.TAS_TITLE = stringReplace("\\+", "__ADD__", oTaskData.TAS_TITLE); + oTaskData.TAS_DESCRIPTION = stringReplace("\\+", "__ADD__", oTaskData.TAS_DESCRIPTION); + //Set AJAX var sParameters = "function=saveTaskData"; @@ -249,6 +253,8 @@ var saveTaskData = function(oForm, iForm, iType) args: sParameters + "&oData=" + oTaskData.toJSONString() }); + oTaskData.TAS_TITLE = oTaskData.TAS_TITLE_BK; + oRPC.callback = function (rpc) { var res = rpc.xmlhttp.responseText.parseJSON(); @@ -377,4 +383,3 @@ var ofToAssignTrigger = function(sStep, sTrigger, sType, iPosition) }.extend(this) }); }; - diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php index 7399c8b44..85dcb59e2 100755 --- a/workflow/engine/methods/tasks/tasks_Ajax.php +++ b/workflow/engine/methods/tasks/tasks_Ajax.php @@ -19,6 +19,9 @@ try { $aData = get_object_vars( G::json_decode( $_POST['oData'] )); //$aData = get_object_vars( $oJSON->decode( $_POST['oData'] ) ); + $aData["TAS_TITLE"] = str_replace("__ADD__", "+", $aData["TAS_TITLE"]); + $aData["TAS_DESCRIPTION"] = str_replace("__ADD__", "+", $aData["TAS_DESCRIPTION"]); + if (isset( $_POST['function'] )) { $sAction = $_POST['function']; } else { From e79cd3f693976cc9fc3f637024501502280d76e9 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Fri, 17 Oct 2014 16:01:32 -0400 Subject: [PATCH 2/2] BUG 240 "The character + character..." SOLVED - The character "+" character becomes " " (space) in the title of the task - Problema resuelto, cuando se selecciona "properties" de un "task", en el tab "Definition" al insertar en el titulo el caracter "+" no se mostraba, se valida el caracter y se muestra correctamente. --- workflow/engine/js/processmap/core/processes_Map.js | 2 +- workflow/engine/methods/tasks/tasks_Ajax.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index 337eb60f3..e45be59db 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -244,7 +244,7 @@ var saveTaskData = function(oForm, iForm, iType) oTaskData.TAS_TITLE = stringReplace("\\+", "__ADD__", oTaskData.TAS_TITLE); oTaskData.TAS_DESCRIPTION = stringReplace("\\+", "__ADD__", oTaskData.TAS_DESCRIPTION); - //Set AJAX + //Set AJAX var sParameters = "function=saveTaskData"; var oRPC = new leimnud.module.rpc.xmlhttp({ diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php index 85dcb59e2..d4aa963dc 100755 --- a/workflow/engine/methods/tasks/tasks_Ajax.php +++ b/workflow/engine/methods/tasks/tasks_Ajax.php @@ -15,7 +15,7 @@ try { break; } - //$oJSON = new Services_JSON(); + //$oJSON = new Services_JSON(); $aData = get_object_vars( G::json_decode( $_POST['oData'] )); //$aData = get_object_vars( $oJSON->decode( $_POST['oData'] ) );