fernando/luos
1
0
Fork 0
Code Releases Activity

Merge from 3.0.1.5 to 3.0.1

Browse Source
This commit is contained in:
Julio Cesar Laura
2015-10-15 13:22:50 -04:00
parent bb85529b86 2c0af1e426
commit d5728cb938
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.bootstrap.php
View File

@@ -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();

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

@@ -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 = "<div style='background-color:" . $color . ";color: white;padding: 1px 2px 1px 5px;' class='userGroupTitle'>" . $_SESSION['G_MESSAGE_TYPE'] . ": " . $_SESSION['G_MESSAGE'] . "</div>";
unset($_SESSION['G_MESSAGE_TYPE']);
unset($_SESSION['G_MESSAGE_TYPE']);
unset($_SESSION['G_MESSAGE']);
}
$title = $msg .

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

@@ -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);

7
workflow/engine/methods/cases/open.php
View File

@@ -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' );