diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index 1957b3105..ff19645a9 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -2958,7 +2958,7 @@ class Bootstrap */ public static function setLanguage() { - $acceptLanguage = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + $acceptLanguage = isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])?$_SERVER['HTTP_ACCEPT_LANGUAGE']:'en'; if (!defined('SYS_LANG')) { $Translations = new \Translation; $translationsTable = $Translations->getTranslationEnvironments(); diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 9e84a246b..747752418 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -81,7 +81,7 @@ class pmDynaform $a->addSelectColumn(DynaformPeer::PRO_UID); $a->addSelectColumn(DynaformPeer::DYN_UID); $a->add(DynaformPeer::PRO_UID, $this->record["PRO_UID"], Criteria::EQUAL); - $a->add(DynaformPeer::DYN_UID, $this->record["DYN_UID"], Criteria::ALT_NOT_EQUAL); + $a->add(DynaformPeer::DYN_UID, $this->record["DYN_UID"], Criteria::NOT_EQUAL); $ds = DynaformPeer::doSelectRS($a); $ds->setFetchmode(ResultSet::FETCHMODE_ASSOC); $this->records = array(); @@ -251,7 +251,9 @@ class pmDynaform } if (isset($this->fields["APP_DATA"][$json->name])) { $json->data->value = $this->fields["APP_DATA"][$json->name]; - $json->data->label = $this->fields["APP_DATA"][$json->name . "_label"]; + if (isset($this->fields["APP_DATA"][$json->name . "_label"])) { + $json->data->label = $this->fields["APP_DATA"][$json->name . "_label"]; + } } } if ($key === "type" && ($value === "radio")) { @@ -375,7 +377,9 @@ class pmDynaform if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) { $dataValue = array(); $dataLabel = array(); - $dv = $this->fields["APP_DATA"][$json->name]; + $dv = array(); + if (isset($this->fields["APP_DATA"][$json->name])) + $dv = $this->fields["APP_DATA"][$json->name]; foreach ($dv as $idv) { foreach ($json->optionsSql as $os) { if ($os->value === $idv) { @@ -452,7 +456,7 @@ class pmDynaform if (isset($this->fields["STEP_MODE"]) && $this->fields["STEP_MODE"] === "VIEW" && isset($json->mode)) { $json->mode = "view"; } - if ($key === "type" && ($value === "form")) { + if ($key === "type" && ($value === "form") && $this->records != null) { foreach ($this->records as $ri) { if ($json->id === $ri["DYN_UID"] && !isset($json->jsonUpdate)) { $jsonUpdate = json_decode($ri["DYN_CONTENT"]); @@ -604,7 +608,7 @@ class pmDynaform if ($_SESSION['G_MESSAGE_TYPE'] === "INFO") $color = "green"; $msg = "
" . $_SESSION['G_MESSAGE_TYPE'] . ": " . $_SESSION['G_MESSAGE'] . "
"; - unset($_SESSION['G_MESSAGE_TYPE']); + unset($_SESSION['G_MESSAGE_TYPE']); unset($_SESSION['G_MESSAGE']); } $title = $msg . diff --git a/workflow/engine/methods/cases/cases_Open.php b/workflow/engine/methods/cases/cases_Open.php index a1e4b3ee4..acdea01ce 100755 --- a/workflow/engine/methods/cases/cases_Open.php +++ b/workflow/engine/methods/cases/cases_Open.php @@ -207,6 +207,7 @@ try { } $_SESSION['PROCESS'] = $aFields['PRO_UID']; $_SESSION['TASK'] = - 1; + $_SESSION['bNoShowSteps'] = 1; //$Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] ); if ($_action == 'jump') { $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], 1); diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index aa6aec30f..cf0a7c3f4 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -108,6 +108,11 @@ if(!isset($_SESSION['APPLICATION']) || !isset($_SESSION['TASK']) || !isset($_SES $_SESSION['TASK'] = $case['TAS_UID']; $_SESSION['INDEX'] = $case['DEL_INDEX']; } -$_SESSION['TASK'] = $_GET['action'] == "unassigned" ? -1 : $_SESSION['TASK']; +$_SESSION['TASK'] = ($_GET['action'] == "unassigned" || $_GET['action'] == "sent" ) ? -1 : $_SESSION['TASK']; +if($_GET['action'] == "todo" || $_GET['action'] == "draft") { + if (isset($_SESSION['bNoShowSteps'])) { + unset($_SESSION['bNoShowSteps']); + } +} G::RenderPage( 'publish', 'extJs' );