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

fix: 21139

Browse Source
This commit is contained in:
Florian HENRY 2022-06-07 14:31:22 +02:00
parent 661c414703
commit d4bbc72b1b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/ticket/card.php
View File

@ -387,6 +387,7 @@ if (empty($reshook)) {
// Si déjà un user assigné on le supprime des contacts // Si déjà un user assigné on le supprime des contacts
if ($useroriginassign > 0) { if ($useroriginassign > 0) {
$internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC'); $internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC');
foreach ($internal_contacts as $key => $contact) { foreach ($internal_contacts as $key => $contact) {
if ($contact['id'] !== $usertoassign) { if ($contact['id'] !== $usertoassign) {
$result = $object->delete_contact($contact['rowid']); $result = $object->delete_contact($contact['rowid']);
@ -1055,7 +1056,7 @@ if ($action == 'create' || $action == 'presend') {
print '<input type="hidden" name="action" value="assign_user">'; print '<input type="hidden" name="action" value="assign_user">';
print '<input type="hidden" name="track_id" value="'.$object->track_id.'">'; print '<input type="hidden" name="track_id" value="'.$object->track_id.'">';
//print '<label for="fk_user_assign">'.$langs->trans("AssignUser").'</label> '; //print '<label for="fk_user_assign">'.$langs->trans("AssignUser").'</label> ';
print $form->select_dolusers($user->id, 'fk_user_assign', 1); print $form->select_dolusers(empty($object->fk_user_assign)?$user->id:$object->fk_user_assign, 'fk_user_assign', 1);
print ' <input type="submit" class="button small" name="btn_assign_user" value="'.$langs->trans("Validate").'" />'; print ' <input type="submit" class="button small" name="btn_assign_user" value="'.$langs->trans("Validate").'" />';
print '</form>'; print '</form>';
} }

11
htdocs/ticket/class/ticket.class.php
View File

@ -496,6 +496,13 @@ class Ticket extends CommonObject
} }
} }
if (!$error && $this->fk_user_assign > 0) {
if ($this->add_contact($this->fk_user_assign, 'SUPPORTTEC', 'internal') < 0) {
$error++;
}
}
//Update extrafield //Update extrafield
if (!$error) { if (!$error) {
$result = $this->insertExtraFields(); $result = $this->insertExtraFields();
@ -2194,6 +2201,10 @@ class Ticket extends CommonObject
$sql .= " AND tc.source = 'external'"; $sql .= " AND tc.source = 'external'";
} }
if (!empty($code)) {
$sql .= " AND tc.code = '".$this->db->escape($code)."'";
}
$sql .= " AND tc.active=1"; $sql .= " AND tc.active=1";
if ($status >= 0) { if ($status >= 0) {
$sql .= " AND ec.statut = ".((int) $status); $sql .= " AND ec.statut = ".((int) $status);