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

Merge pull request #1222 from victorsl/BUG-10229

Browse Source 
BUG 10229 "Al hacer correr una caso con campo dependientes..." SOLVED
This commit is contained in:
julceslauhub
2013-01-24 09:19:39 -08:00
parent e843576f79 daf067c6cd
commit 8bbab35191
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gulliver/methods/defaultAjax.php
View File

@@ -125,6 +125,8 @@ for ($r = 0; $r < sizeof( $newValues ); $r ++) {
$dependentFields = array_unique( $dependentFields ); $dependentFields = array_unique( $dependentFields );
//Delete all dependencies of all fields, we're interested only in the fields sending from AJAX, this in grids //Delete all dependencies of all fields, we're interested only in the fields sending from AJAX, this in grids
$arrayFieldSubDependent = array();
if (isset($_POST["grid"])) { if (isset($_POST["grid"])) {
$arrayField = (array)(Bootstrap::json_decode(urlDecode(stripslashes($_POST["fields"])))); $arrayField = (array)(Bootstrap::json_decode(urlDecode(stripslashes($_POST["fields"]))));
$arrayDependentField = array(); $arrayDependentField = array();
@@ -140,11 +142,26 @@ if (isset($_POST["grid"])) {
if ($ereg != null) { if ($ereg != null) {
foreach ($dependentFields as $value) { foreach ($dependentFields as $value) {
if (preg_match("/^(?:$ereg)\|.*$/", $value)) { //Direct dependent fields
if (preg_match("/^(?:$ereg)\|[^\|]*$/", $value)) {
$arrayAux = explode("|", $value); $arrayAux = explode("|", $value);
$arrayDependentField[] = $arrayAux[1]; $arrayDependentField[] = $arrayAux[1];
} }
//Subdependent fields
if (preg_match("/^(?:$ereg)\|.*$/", $value)) {
$arrayAux = explode("|", $value);
$index = $arrayAux[0];
unset($arrayAux[0]);
if (isset($arrayFieldSubDependent[$index])) {
$arrayFieldSubDependent[$index] = array_unique(array_merge($arrayFieldSubDependent[$index], $arrayAux));
} else {
$arrayFieldSubDependent[$index] = array_unique($arrayAux);
}
}
} }
} }
@@ -153,11 +170,21 @@ if (isset($_POST["grid"])) {
//Completed all fields of the grid //Completed all fields of the grid
if (isset($_POST["grid"]) && isset($_POST["gridField"])) { if (isset($_POST["grid"]) && isset($_POST["gridField"])) {
//Completed all fields of the grid
$arrayGridField = (array)(Bootstrap::json_decode(urldecode(stripslashes($_POST["gridField"])))); $arrayGridField = (array)(Bootstrap::json_decode(urldecode(stripslashes($_POST["gridField"]))));
foreach ($arrayGridField as $index => $value) { foreach ($arrayGridField as $index => $value) {
$G_FORM->values[$_POST["grid"]][$_POST["row"]][$index] = $value; $G_FORM->values[$_POST["grid"]][$_POST["row"]][$index] = $value;
} }
//Delete all fields subdependent
foreach ($arrayFieldSubDependent as $index1 => $value1) {
$arrayAux = $value1;
foreach ($arrayAux as $value2) {
unset($G_FORM->values[$_POST["grid"]][$_POST["row"]][$value2]);
}
}
} }
//Parse and update the new content //Parse and update the new content
@@ -276,9 +303,7 @@ function subDependencies ($k, &$G_FORM, &$aux, $grid = '')
//Set field and the dependent field of the grid //Set field and the dependent field of the grid
foreach ($myDependentFields as $index => $value) { foreach ($myDependentFields as $index => $value) {
if (!preg_match("/^.*\|.*$/", $value)) { $myDependentFields[$index] = $k . "|" . $value;
$myDependentFields[$index] = $k . "|" . $value;
}
} }
} }