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

Add missing fk_user in import list

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-23 13:49:13 +01:00
parent a076c3c20c
commit c6ed605d26
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,11 @@ class FormOther
public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null) public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
{ {
// phpcs:enable // phpcs:enable
$sql = "SELECT rowid, label"; global $conf;
$sql = "SELECT rowid, label, fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."export_model"; $sql .= " FROM ".MAIN_DB_PREFIX."export_model";
$sql .= " WHERE type = '".$type."'"; $sql .= " WHERE type = '".$this->db->escape($type)."'";
if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
$sql .= " ORDER BY rowid"; $sql .= " ORDER BY rowid";
$result = $this->db->query($sql); $result = $this->db->query($sql);
@ -99,6 +101,11 @@ class FormOther
print '<option value="'.$obj->rowid.'">'; print '<option value="'.$obj->rowid.'">';
} }
print $obj->label; print $obj->label;
if (! empty($conf->global->EXPORTS_SHARE_MODELS) && $fk_user == $obj->fk_user) {
$tmpuser = new User($this->db);
$tmpuser->fetch($fk_user);
print ' ('.$tmpuser->getFullName().')';
}
print '</option>'; print '</option>';
$i++; $i++;
} }