lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add possibility to define dependencies between extra lists

Browse Source
This commit is contained in:
Maxime Kohlhaas 2013-07-18 17:42:09 +02:00
parent 36b8527bf3
commit 63e6cf5c81
2 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/core/class/commonobject.class.php
View File

@ -2271,6 +2271,35 @@ abstract class CommonObject
} }
$out .= "\n"; $out .= "\n";
$out .= '<!-- /showOptionalsInput --> '; $out .= '<!-- /showOptionalsInput --> ';
$out .= '
<script type="text/javascript">
jQuery(document).ready(function() {
function showOptions(child_list, parent_list)
{
var val = $("select[name=\"options_"+parent_list+"\"]").val();
var parentVal = parent_list + ":" + val;
if(val > 0) {
$("select[name=\""+child_list+"\"] option[parent]").hide();
$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
} else {
$("select[name=\""+child_list+"\"] option").show();
}
}
function setListDependencies() {
jQuery("select option[parent]").parent().each(function() {
var child_list = $(this).attr("name");
var parent = $(this).find("option[parent]:first").attr("parent");
var infos = parent.split(":");
var parent_list = infos[0];
$("select[name=\"options_"+parent_list+"\"]").change(function() {
showOptions(child_list, parent_list);
});
});
}
setListDependencies();
});
</script>';
} }
return $out; return $out;
} }

26
htdocs/core/class/extrafields.class.php
View File

@ -673,8 +673,10 @@ class ExtraFields
$out='<select class="flat" name="options_'.$key.'">'; $out='<select class="flat" name="options_'.$key.'">';
foreach ($param['options'] as $key=>$val ) foreach ($param['options'] as $key=>$val )
{ {
list($val, $parent) = explode('|', $val);
$out.='<option value="'.$key.'"'; $out.='<option value="'.$key.'"';
$out.= ($value==$key?'selected="selected"':''); $out.= ($value==$key?' selected="selected"':'');
$out.= (!empty($parent)?' parent="'.$parent.'"':'');
$out.='>'.$val.'</option>'; $out.='>'.$val.'</option>';
} }
$out.='</select>'; $out.='</select>';
@ -688,11 +690,16 @@ class ExtraFields
// 0 1 : tableName // 0 1 : tableName
// 1 2 : label field name Nom du champ contenant le libelle // 1 2 : label field name Nom du champ contenant le libelle
// 2 3 : key fields name (if differ of rowid) // 2 3 : key fields name (if differ of rowid)
// 3 4 : key field parent (for dependent lists)
$keyList='rowid'; $keyList='rowid';
if (count($InfoFieldList)==3) if (count($InfoFieldList)>=3)
$keyList=$InfoFieldList[2].' as rowid'; $keyList=$InfoFieldList[2].' as rowid';
if (count($InfoFieldList)>=4) {
list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
$keyList.= ', '.$parentField;
}
$sql = 'SELECT '.$keyList.', '.$InfoFieldList[1]; $sql = 'SELECT '.$keyList.', '.$InfoFieldList[1];
$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0]; $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
@ -718,14 +725,15 @@ class ExtraFields
$labeltoshow=dol_trunc($obj->$InfoFieldList[1],18); $labeltoshow=dol_trunc($obj->$InfoFieldList[1],18);
} }
if ($value==$obj->rowid) if(!empty($InfoFieldList[3])) {
{ $parent = $parentName.':'.$obj->{$parentField};
$out.='<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
}
else
{
$out.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
} }
$out.='<option value="'.$obj->rowid.'"';
$out.= ($value==$obj->rowid?' selected="selected"':'');
$out.= (!empty($parent)?' parent="'.$parent.'"':'');
$out.='>'.$labeltoshow.'</option>';
$i++; $i++;
} }
} }