Merge branch '2.0' of git.colosa.net:processmaker into 2.0
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,6 +2,7 @@
|
||||
nbproject
|
||||
workflow/engine/config/paths_installed.php
|
||||
gulliver/thirdparty/html2ps_pdf/cache
|
||||
workflow/engine/content/languages/translations.environments
|
||||
*~
|
||||
workflow/engine/js/labels/
|
||||
workflow/public_html/files/
|
||||
|
||||
@@ -418,7 +418,7 @@ class Form extends XmlForm
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
/* else{
|
||||
if ($v->type == 'checkbox') {
|
||||
$values[$k]=$v->falseValue;
|
||||
}
|
||||
@@ -427,7 +427,7 @@ class Form extends XmlForm
|
||||
$values[$k] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
else {
|
||||
if (isset($_FILES['form']['name'][$k])) {
|
||||
|
||||
@@ -546,6 +546,7 @@ switch($_POST['action']) {
|
||||
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
|
||||
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
|
||||
$_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
|
||||
if(!isset($_SESSION['CURRENT_DYN_UID'])) $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID'];
|
||||
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
|
||||
G::RenderPage('publish', 'raw');
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user