fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2015-01-24 14:37:59 -04:00
parent 0ac577a96c c61148e992
commit cc5f4dc319
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ class pmDynaform
exit();
}
public function printEdit($pm_run_outside_main_app, $application, $headData)
public function printEdit($pm_run_outside_main_app, $application, $headData, $step_mode = 'EDIT')
{
ob_clean();
@@ -101,6 +101,7 @@ class pmDynaform
$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("{STEP_MODE}", $step_mode, $file);
$file = str_replace("{WORKSPACE}", $this->app_data["SYS_SYS"], $file);
$file = str_replace("{credentials}", json_encode($clientToken), $file);
echo $file;

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

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

2
workflow/engine/methods/cases/cases_Step.php
View File

@@ -264,7 +264,7 @@ try {
G::LoadClass('pmDynaform');
$a = new pmDynaform($_GET['UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array);
$a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array, $oStep->getStepMode());
} else {
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
}

7
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -1597,8 +1597,9 @@ function copymove(action) {
// alert('Move ' + dropEvent.data.node.id.replace( /_RRR_/g, '/' )+' to
// '+ dropEvent.target.id.replace( /_RRR_/g, '/' ));
requestParams = getRequestParams();
requestParams.dir = datastore.directory.substring(0,
datastore.directory.lastIndexOf('/'));
requestParams.copyMove = 'all';
//requestParams.dir = datastore.directory.substring(0,
// datastore.directory.lastIndexOf('/'));
requestParams.new_dir = dropEvent.target.id.replace(/_RRR_/g, '/');
requestParams.new_dir = requestParams.new_dir.replace(/ext_root/g, '');
requestParams.selitems = Array(dropEvent.data.node.id.replace(/_RRR_/g,
@@ -1606,6 +1607,8 @@ function copymove(action) {
requestParams.confirm = 'true';
requestParams.action = action;
handleCallback(requestParams);
requestParams.copyMove = '';
requestParams.dir = '';
}
}
// context menus

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

@@ -25,6 +25,7 @@
var __DynaformName__ = '{DYNAFORMNAME}';
var app_uid = '{APP_UID}';
var prj_uid = '{PRJ_UID}';
var step_mode = '{STEP_MODE}';
var workspace = '{WORKSPACE}';
var credentials = {credentials};
</script>