fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
Quenta Ronald
2015-01-26 10:10:21 -04:00
parent 7d48c79386 d58e376f89
commit aaf48f74ed
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.case.php
View File

@@ -988,10 +988,11 @@ class Cases
if (isset($Fields["APP_STATUS"]) && $Fields["APP_STATUS"] == "COMPLETED") {
if (isset($Fields['CURRENT_USER_UID'])) {
$Fields['USR_UID'] = $Fields['CURRENT_USER_UID'];
/*This "list" code is discussed to operate with sub-processes. It should adjust the code for operation with sub-processes.
$listCompleted = new ListCompleted();
$listCompleted->create($Fields);
$listMyInbox = new ListMyInbox();
$listMyInbox->refresh($Fields);
$listMyInbox->refresh($Fields);*/
}
}
$oApp->update($Fields);

10
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -851,7 +851,15 @@ class Ajax
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = "";
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP"] = "#";
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_ACTION"] = "return false;";
$G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_POST["DYN_UID"], "", $Fields["APP_DATA"], "", "", "view");
G::LoadClass('pmDynaform');
$a = new pmDynaform($_REQUEST['DYN_UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->app_data["PROCESS"] = $_SESSION['PROCESS'];
$a->app_data["SYS_SYS"] = SYS_SYS;
$a->printView((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION']);
} else {
$G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_POST["DYN_UID"], "", $Fields["APP_DATA"], "", "", "view");
}
?>
<script type="text/javascript">

4
workflow/engine/src/ProcessMaker/BusinessModel/Trigger.php
View File

@@ -74,7 +74,9 @@ class Trigger
} else {
if ($aRow['TRI_PARAM'] != '' && $aRow['TRI_PARAM'] != 'PRIVATE') {
$aRow['TRI_PARAM'] = unserialize($aRow['TRI_PARAM']);
$aRow['TRI_PARAM'] = \G::json_encode($aRow['TRI_PARAM']);
unset($aRow["TRI_PARAM"]["hash"]);
unset($aRow["TRI_PARAM"]["params"]["TRI_WEBBOT"]);
}
}
$triggersArray[] = array_change_key_case($aRow, CASE_LOWER);

1
workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
View File

@@ -29,6 +29,7 @@
var credentials = {credentials};
$(window).load(function () {
var data = jsondata;
data.items[0].mode = "view";
window.project = new PMDynaform.core.Project({
data: data,
keys: {

1
workflow/engine/templates/processes/main.js
View File

@@ -447,6 +447,7 @@ Ext.onReady(function(){
id: "mnuGenerateBpmn",
text: _("ID_GENERATE_BPMN_PROJECT"),
iconCls: "button_menu_ext ss_sprite ss_page_white_go",
hidden: true,
handler: function ()
{
generateBpmn();