fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2015-01-15 09:11:26 -04:00
parent abeb15e12b c771300aa6
commit c33fd019e8
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/class.pmDynaform.php
View File

@@ -50,12 +50,27 @@ class pmDynaform
public function printView($pm_run_outside_main_app, $application)
{
ob_clean();
$a = $this->clientToken();
$clientToken = array(
"accessToken" => $a["access_token"],
"expiresIn" => $a["expires_in"],
"tokenType" => $a["token_type"],
"scope" => $a["scope"],
"refreshToken" => $a["refresh_token"],
"clientId" => $a["client_id"],
"clientSecret" => $a["client_secret"]
);
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/cases_Step_Pmdynaform_View.html');
$file = str_replace("{JSON_DATA}", $this->record["DYN_CONTENT"], $file);
$file = str_replace("{PM_RUN_OUTSIDE_MAIN_APP}", $pm_run_outside_main_app, $file);
$file = str_replace("{DYN_UID}", $this->dyn_uid, $file);
$file = str_replace("{DYNAFORMNAME}", $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"], $file);
$file = str_replace("{APP_UID}", $application, $file);
$file = str_replace("{PRJ_UID}", $this->app_data["PROCESS"], $file);
$file = str_replace("{WORKSPACE}", $this->app_data["SYS_SYS"], $file);
$file = str_replace("{credentials}", json_encode($clientToken), $file);
echo $file;
exit();
}

4
workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
View File

@@ -49,9 +49,7 @@ $(window).load(function () {
data: {},
keys: window.project.token,
successCallback: function (xhr, response) {
if (response[jsondata.name] && window.project.setData2) {
window.project.setData2(response[jsondata.name]);
}
window.project.setData2(response);
}
});

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1439,7 +1439,7 @@ class Cases
$fields = $case->loadCase($app_uid);
$_POST['form'] = $app_data;
if (!is_null($dyn_uid)) {
if (!is_null($dyn_uid) && $dyn_uid != '') {
$oDynaform = \DynaformPeer::retrieveByPK($dyn_uid);
if ($oDynaform->getDynVersion() < 2) {

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

@@ -45,9 +45,7 @@
data: {},
keys: window.project.token,
successCallback: function (xhr, response) {
if (response[jsondata.name] && window.project.setData2) {
window.project.setData2(response[jsondata.name]);
}
window.project.setData2(response);
}
});
$(document).find('form').submit(function (e) {