diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index 3aec7f35a..36f166d69 100644 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -225,6 +225,12 @@ class headPublisher } $head = $head . " + + diff --git a/workflow/engine/templates/cases/missRequiredFields.php b/workflow/engine/templates/cases/missRequiredFields.php index 8067c5c02..644e53581 100755 --- a/workflow/engine/templates/cases/missRequiredFields.php +++ b/workflow/engine/templates/cases/missRequiredFields.php @@ -72,9 +72,15 @@ $previouspage = $_POST['previous_step']['PAGE']; $html .= ''; - $html .= ''; - $html .= ''; - + if($netxpage == ""){ + $html .= ''; + $html .= ''; + $html .= ''; + } else{ + $html .= ''; + $html .= ''; + } + echo '
diff --git a/workflow/engine/templates/processes/webentryPost.tpl b/workflow/engine/templates/processes/webentryPost.tpl index 8efdf7c65..c612bf038 100755 --- a/workflow/engine/templates/processes/webentryPost.tpl +++ b/workflow/engine/templates/processes/webentryPost.tpl @@ -137,6 +137,30 @@ try { * you can change it or redirect to another page * i.e. G::header("Location: http://www.processmaker.com"); */ + + $_POST['__notValidateThisFields__'] = (isset( $_POST['__notValidateThisFields__'] ) && $_POST['__notValidateThisFields__'] != '') ? $_POST['__notValidateThisFields__'] : $_POST['DynaformRequiredFields']; + if ($missing_req_values = $oForm->validateRequiredFields( $_POST['form'], Bootstrap::json_decode( stripslashes( $_POST['__notValidateThisFields__'] ) ) )) { + $fieldsRequired = Bootstrap::json_decode(str_replace(array("%27", "%39"), array("\"", "'"), $_POST["DynaformRequiredFields"])); + + foreach ($fieldsRequired as $key1 => $value1) { + foreach ($missing_req_values as $key2 => $value2) { + if ($value1->name == $value2) { + $missing_req_values[$key2] = $value1->label; + } + } + } + + $_POST['next_step']['PAGE'] = ""; + $_POST['previous_step']['PAGE'] = $_SERVER['HTTP_REFERER']; + $_POST['req_val'] = $missing_req_values; + + global $G_PUBLISH; + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent( 'view', 'cases/missRequiredFields' ); + G::RenderPage( 'publish', 'blank' ); + exit( 0 ); + } + $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent("xmlform", "xmlform", "login/showInfo", "", $aMessage); G::RenderPage("publish", "blank");