Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi input workflow for text type (#29820)

Browse Source 
* Fix multi input workflow for text type

* fix phan

* fix phan

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
This commit is contained in:
Lucas Marcouiller 2024-06-03 16:47:48 +02:00 committed by GitHub
parent 47d36d3c44
commit c5df307d03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7329,15 +7329,6 @@ abstract class CommonObject
// Special case that prevent to force $type to have multiple input
if (empty($this->fields[$key]['multiinput'])) {
$type = (($this->fields[$key]['type'] == 'checkbox') ? $this->fields[$key]['type'] : 'select');
} else {
$valuearray = explode(",", $value);
foreach ($valuearray as $keytmp => $valuetmp) {
if (!empty($this->fields[$key]['arrayofkeyval'][$valuetmp])) {
$valuemultiselectinput[] = $valuetmp;
unset($valuearray[$keytmp]);
}
}
$value = implode(',', $valuearray);
}
}
@ -7440,7 +7431,49 @@ abstract class CommonObject
if (!preg_match('/search_/', $keyprefix)) { // If keyprefix is search_ or search_options_, we must just use a simple text field
if (!empty($param['options'])) {
$out .= "<br>";
$out .= $form->multiselectarray($keyprefix.$key.$keysuffix."_multiselect", $param['options'], (GETPOSTISSET($keyprefix.$key.$keysuffix."_multiselect") ? GETPOST($keyprefix.$key.$keysuffix."_multiselect") : $valuemultiselectinput), 0, 0, "flat maxwidthonphone".$morecss, 0, '90%', '', '', '', ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) ? 1 : -1));
$out .= $form->selectarray($keyprefix.$key.$keysuffix."_multiinput", $param['options'], '', 1, 0, 0, "flat maxwidthonphone".$morecss);
$out .= "<script>";
$out .= '
function handlemultiinputdisabling(htmlname){
console.log("We handle the disabling of used options for "+htmlname+"_multiinput");
multiinput = $("#"+htmlname+"_multiinput");
multiinput.find("option").each(function(){
tmpval = $("#"+htmlname).val();
tmpvalarray = tmpval.split(",");
valtotest = $(this).val();
if(tmpvalarray.includes(valtotest)){
$(this).prop("disabled",true);
} else {
if($(this).prop("disabled") == true){
console.log(valtotest)
$(this).prop("disabled", false);
}
}
});
}
$(document).ready(function () {
$("#'.$keyprefix.$key.$keysuffix.'_multiinput").on("change",function() {
console.log("We add the selected value to the text area '.$keyprefix.$key.$keysuffix.'");
tmpval = $("#'.$keyprefix.$key.$keysuffix.'").val();
tmpvalarray = tmpval.split(",");
valtotest = $(this).val();
if(valtotest != -1 && !tmpvalarray.includes(valtotest)){
if(tmpval == ""){
tmpval = valtotest;
} else {
tmpval = tmpval + "," + valtotest;
}
$("#'.$keyprefix.$key.$keysuffix.'").val(tmpval);
handlemultiinputdisabling("'.$keyprefix.$key.$keysuffix.'");
}
});
$("#'.$keyprefix.$key.$keysuffix.'").on("change",function(){
handlemultiinputdisabling($(this).attr("id"));
});
handlemultiinputdisabling("'.$keyprefix.$key.$keysuffix.'");
})';
$out .= "</script>";
}
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

8
htdocs/webhook/target_card.php
View File

@ -403,14 +403,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
//$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field
//unset($object->fields['fk_project']); // Hide field already shown in banner
//unset($object->fields['fk_soc']); // Hide field already shown in banner
// TODO Remove this part of code
$arraytriggercodes = explode(",", $object->trigger_codes);
foreach ($arraytriggercodes as $key => $value) {
if (isset($object->fields["trigger_codes"]['arrayofkeyval'][$value])) {
$arraytriggercodes[$key] = $object->fields["trigger_codes"]['arrayofkeyval'][$value];
}
}
$object->trigger_codes = implode(",", $arraytriggercodes);
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';