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

Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Browse Source
This commit is contained in:
erik
2011-03-23 18:18:01 -04:00
parent 2019ea9da5 d19a0357a2
commit c580a0681a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,6 +2,7 @@
nbproject nbproject
workflow/engine/config/paths_installed.php workflow/engine/config/paths_installed.php
gulliver/thirdparty/html2ps_pdf/cache gulliver/thirdparty/html2ps_pdf/cache
workflow/engine/content/languages/translations.environments
*~ *~
workflow/engine/js/labels/ workflow/engine/js/labels/
workflow/public_html/files/ workflow/public_html/files/

4
gulliver/system/class.form.php
View File

@@ -418,7 +418,7 @@ class Form extends XmlForm
} }
} }
} }
else{ /* else{
if ($v->type == 'checkbox') { if ($v->type == 'checkbox') {
$values[$k]=$v->falseValue; $values[$k]=$v->falseValue;
} }
@@ -427,7 +427,7 @@ class Form extends XmlForm
$values[$k] = null; $values[$k] = null;
} }
} }
} }*/
} }
else { else {
if (isset($_FILES['form']['name'][$k])) { if (isset($_FILES['form']['name'][$k])) {

1
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -546,6 +546,7 @@ switch($_POST['action']) {
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#'; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;'; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
$_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID']; $_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_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
G::RenderPage('publish', 'raw'); G::RenderPage('publish', 'raw');
break; break;