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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-13 23:08:34 +02:00
commit c4076fc8bd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/ajax.lib.php
View File

@ -425,7 +425,8 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
}, },
escapeMarkup: function(markup) { escapeMarkup: function(markup) {
return markup; return markup;
} },
dropdownCssClass: \'ui-dialog\'
})'; })';
if ($forcefocus) $msg.= '.select2(\'focus\')'; if ($forcefocus) $msg.= '.select2(\'focus\')';
$msg.= ';'."\n"; $msg.= ';'."\n";