Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance select_salesrepresentatives with select2

Browse Source
This commit is contained in:
Frédéric FRANCE
2014-12-23 16:42:05 +01:00
parent 2b4edd9996
commit d03cc03cd7
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/class/html.formother.class.php
View File

@@ -356,9 +356,18 @@ class FormOther
global $conf,$langs; global $conf,$langs;
$langs->load('users'); $langs->load('users');
$out = '';
$nodatarole = '';
// Enhance with select2
if ($conf->use_javascript_ajax)
{
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$out.= ajax_combobox($htmlname);
$nodatarole=' data-role="none"';
}
// Select each sales and print them in a select input // Select each sales and print them in a select input
$moreforfilter ='<select class="flat" name="'.$htmlname.'">'; $out.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
$moreforfilter.='<option value="">&nbsp;</option>'; $out.='<option value="">&nbsp;</option>';
// Get list of users allowed to be viewed // Get list of users allowed to be viewed
$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login"; $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
@@ -383,34 +392,35 @@ class FormOther
{ {
while ($obj_usr = $this->db->fetch_object($resql_usr)) while ($obj_usr = $this->db->fetch_object($resql_usr))
{ {
$moreforfilter.='<option value="'.$obj_usr->rowid.'"';
if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="selected"'; $out.='<option value="'.$obj_usr->rowid.'"';
$moreforfilter.='>'; if ($obj_usr->rowid == $selected) $out.=' selected="selected"';
$moreforfilter.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
$out.='>';
$out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
// Complete name with more info // Complete name with more info
$moreinfo=0; $moreinfo=0;
if (! empty($conf->global->MAIN_SHOW_LOGIN)) if (! empty($conf->global->MAIN_SHOW_LOGIN))
{ {
$moreforfilter.=($moreinfo?' - ':' (').$obj_usr->login; $out.=($moreinfo?' - ':' (').$obj_usr->login;
$moreinfo++; $moreinfo++;
} }
if ($showstatus >= 0) if ($showstatus >= 0)
{ {
if ($obj_usr->statut == 1 && $showstatus == 1) if ($obj_usr->statut == 1 && $showstatus == 1)
{ {
$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Enabled'); $out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
$moreinfo++; $moreinfo++;
} }
if ($obj_usr->statut == 0) if ($obj_usr->statut == 0)
{ {
$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Disabled'); $out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
$moreinfo++; $moreinfo++;
} }
} }
$moreforfilter.=($moreinfo?')':''); $out.=($moreinfo?')':'');
$moreforfilter.='</option>'; $out.='</option>';
} }
$this->db->free($resql_usr); $this->db->free($resql_usr);
} }
@@ -418,9 +428,9 @@ class FormOther
{ {
dol_print_error($this->db); dol_print_error($this->db);
} }
$moreforfilter.='</select>'; $out.='</select>';
return $moreforfilter; return $out;
} }
/** /**