fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/veronicaaruquipa/processmaker into fixing-broken-features

Browse Source
This commit is contained in:
veronicaaruquipa
2014-12-18 19:29:18 -04:00
parent 4535b97854 e3251d45b0
commit e83469478a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@@ -243,6 +243,7 @@ def buildMafe(homeDir, targetDir, mode)
"#{homeDir}/lib/jQueryLayout/jquery.layout.min.js" => "#{jsTargetDir}/jquery.layout.min.js", "#{homeDir}/lib/jQueryLayout/jquery.layout.min.js" => "#{jsTargetDir}/jquery.layout.min.js",
"#{homeDir}/lib/modernizr/modernizr.js" => "#{jsTargetDir}/modernizr.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 puts "\nMichelangelo FE Build Finished\n".magenta
end end

2
workflow/engine/classes/class.derivation.php
View File

@@ -82,7 +82,7 @@ class Derivation
} }
$arrayTaskData["NEXT_TASK"]["USR_UID"] = ""; $arrayTaskData["NEXT_TASK"]["USR_UID"] = "";
$arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = array("USR_UID" => ""); $arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = array("USR_UID" => "", "USR_USERNAME" => "");
} else { } else {
//3. Load the task information of normal NEXT_TASK //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"]."<hr>"; $arrayTaskData["NEXT_TASK"] = $task->load($arrayTaskData["ROU_NEXT_TASK"]); //print $arrayTaskData["ROU_NEXT_TASK"]." **** ".$arrayTaskData["NEXT_TASK"]["TAS_TYPE"]."<hr>";