From d4d9c5845fa940faabdfd5111d8ace701458adf6 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 16 Dec 2014 15:48:11 -0400 Subject: [PATCH 1/2] PMFormDesigner --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index 30f7e8c48..40f0a5ebb 100644 --- a/Rakefile +++ b/Rakefile @@ -243,6 +243,7 @@ def buildMafe(homeDir, targetDir, mode) "#{homeDir}/lib/jQueryLayout/jquery.layout.min.js" => "#{jsTargetDir}/jquery.layout.min.js", "#{homeDir}/lib/modernizr/modernizr.js" => "#{jsTargetDir}/modernizr.js" }) + system "cp -rf #{homeDir}/src/formDesigner/img/* #{mafeDir}/../img" puts "\nMichelangelo FE Build Finished\n".magenta end From 0034008941d7a193abdea78b6072414917e487c7 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Thu, 18 Dec 2014 15:40:43 -0400 Subject: [PATCH 2/2] Fix notice message in class derivation when the next task is end of process --- workflow/engine/classes/class.derivation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 3a922e9a3..9c3328886 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -82,7 +82,7 @@ class Derivation } $arrayTaskData["NEXT_TASK"]["USR_UID"] = ""; - $arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = array("USR_UID" => ""); + $arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = array("USR_UID" => "", "USR_USERNAME" => ""); } else { //3. Load the task information of normal NEXT_TASK $arrayTaskData["NEXT_TASK"] = $task->load($arrayTaskData["ROU_NEXT_TASK"]); //print $arrayTaskData["ROU_NEXT_TASK"]." **** ".$arrayTaskData["NEXT_TASK"]["TAS_TYPE"]."
";