Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX user notification for ticket assigned on creation #25866

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

FIX user notification for ticket assigned on creation #25866

Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2b881ec
FIX user notification for ticket assigned on creation
Sep 11, 2023
00c7ceb
Better code
Sep 11, 2023
051fcb3
Add name
Sep 11, 2023
73ebf81
Add test on error before assign
Sep 11, 2023
5e008cc
Best practice
Sep 13, 2023
020499a
Remove name
Sep 13, 2023
117cbca
Relaunch checks
Sep 13, 2023
3c4e87f
Merge remote-tracking branch 'origin/develop' into assignNotif
Sep 15, 2023
1a16697
Merge remote-tracking branch 'origin/develop' into assignNotif
Sep 15, 2023
30b3e5c
FIX Travis tantrum
Sep 22, 2023
1603153
Merge branch 'develop' into assignNotif
eldy Apr 14, 2024
3663ece
Update interface_50_modTicket_TicketEmail.class.php
eldy Apr 14, 2024
376c8ea
Update interface_50_modTicket_TicketEmail.class.php
eldy Apr 14, 2024
7cb945a
fix indentation
May 2, 2024
0059684
FIX precommit
May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions htdocs/ticket/class/ticket.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Copyright (C) 2019-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2023 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2023 Benjamin Falière <benjamin.faliere@altairis.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -509,7 +510,6 @@ public function create($user, $notrigger = 0)
$sql .= "fk_contract,";
$sql .= "origin_email,";
$sql .= "fk_user_create,";
$sql .= "fk_user_assign,";
$sql .= "email_msgid,";
$sql .= "email_date,";
$sql .= "subject,";
Expand All @@ -535,7 +535,6 @@ public function create($user, $notrigger = 0)
$sql .= " ".($this->fk_contract > 0 ? $this->db->escape($this->fk_contract) : "null").",";
$sql .= " ".(!isset($this->origin_email) ? 'NULL' : "'".$this->db->escape($this->origin_email)."'").",";
$sql .= " ".(!isset($this->fk_user_create) ? ($user->id > 0 ? $user->id : 'NULL') : ($this->fk_user_create > 0 ? $this->fk_user_create : 'NULL')).",";
$sql .= " ".($this->fk_user_assign > 0 ? $this->fk_user_assign : 'NULL').",";
$sql .= " ".(empty($this->email_msgid) ? 'NULL' : "'".$this->db->escape($this->email_msgid)."'").",";
$sql .= " ".(empty($this->email_date) ? 'NULL' : "'".$this->db->idate($this->email_date)."'").",";
$sql .= " ".(!isset($this->subject) ? 'NULL' : "'".$this->db->escape($this->subject)."'").",";
Expand Down Expand Up @@ -568,6 +567,13 @@ public function create($user, $notrigger = 0)
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ticket");
}

// Assign user if defined
altairis-benjamin marked this conversation as resolved.
Show resolved Hide resolved
if ($this->fk_user_assign > 0 && !$error) {
if ($this->assignUser($user, $this->fk_user_assign, $notrigger) < 0) {
$error++;
}
}

if (!$error && !empty($conf->global->TICKET_ADD_AUTHOR_AS_CONTACT)) {
// add creator as contributor
if ($this->add_contact($user->id, 'CONTRIBUTOR', 'internal') < 0) {
Expand Down