From 71104e4c185acdd489cdec07a8a52e4a92f28462 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Fri, 21 Feb 2025 10:59:18 +0100 Subject: [PATCH 1/6] fix: add ticket content from promoted followup --- front/ticket.form.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/front/ticket.form.php b/front/ticket.form.php index c015d6c384b..7c356459c9f 100644 --- a/front/ticket.form.php +++ b/front/ticket.form.php @@ -292,7 +292,14 @@ $track::showKanban(0); Html::footer(); } else { + $otpions = $_REQUEST; $menus = ["helpdesk", "ticket"]; - Ticket::displayFullPageForItem(0, $menus, $_REQUEST); + if ($_GET['_promoted_fup_id']) { + $followup = new ITILFollowup(); + if ($followup->getFromDB($_GET['_promoted_fup_id'])) { + $options['content'] = $followup->fields['content']; + }; + } + Ticket::displayFullPageForItem(0, $menus, $options); } } From 6f2407e1d51d3cab3cfbed57749907580bf24162 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Fri, 21 Feb 2025 11:14:55 +0100 Subject: [PATCH 2/6] fix: add ticket content from promoted tickettask --- front/ticket.form.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/front/ticket.form.php b/front/ticket.form.php index 7c356459c9f..2eb79eac7c0 100644 --- a/front/ticket.form.php +++ b/front/ticket.form.php @@ -300,6 +300,12 @@ $options['content'] = $followup->fields['content']; }; } + if ($_GET['_promoted_task_id']) { + $ticketask = new TicketTask(); + if ($ticketask->getFromDB($_GET['_promoted_task_id'])) { + $options['content'] = $ticketask->fields['content']; + }; + } Ticket::displayFullPageForItem(0, $menus, $options); } } From 79097f229230eb2a0f40d9a08fadb3cc567f4912 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Fri, 21 Feb 2025 11:29:22 +0100 Subject: [PATCH 3/6] fix lint --- front/ticket.form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/ticket.form.php b/front/ticket.form.php index 2eb79eac7c0..58cd536a616 100644 --- a/front/ticket.form.php +++ b/front/ticket.form.php @@ -292,7 +292,7 @@ $track::showKanban(0); Html::footer(); } else { - $otpions = $_REQUEST; + $options = $_REQUEST; $menus = ["helpdesk", "ticket"]; if ($_GET['_promoted_fup_id']) { $followup = new ITILFollowup(); From 2d2965b609a98b7d4b790b3ba16c9d0d5b7a3bf1 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Mon, 24 Feb 2025 14:36:02 +0100 Subject: [PATCH 4/6] fix: add ticket content from promoted followup --- front/ticket.form.php | 15 +-------------- src/Ticket.php | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/front/ticket.form.php b/front/ticket.form.php index 58cd536a616..c015d6c384b 100644 --- a/front/ticket.form.php +++ b/front/ticket.form.php @@ -292,20 +292,7 @@ $track::showKanban(0); Html::footer(); } else { - $options = $_REQUEST; $menus = ["helpdesk", "ticket"]; - if ($_GET['_promoted_fup_id']) { - $followup = new ITILFollowup(); - if ($followup->getFromDB($_GET['_promoted_fup_id'])) { - $options['content'] = $followup->fields['content']; - }; - } - if ($_GET['_promoted_task_id']) { - $ticketask = new TicketTask(); - if ($ticketask->getFromDB($_GET['_promoted_task_id'])) { - $options['content'] = $ticketask->fields['content']; - }; - } - Ticket::displayFullPageForItem(0, $menus, $options); + Ticket::displayFullPageForItem(0, $menus, $_REQUEST); } } diff --git a/src/Ticket.php b/src/Ticket.php index 138f69339a7..2344e2dbabd 100644 --- a/src/Ticket.php +++ b/src/Ticket.php @@ -4301,7 +4301,7 @@ public function showForm($ID, array $options = []) $options['entities_id'] = $item->fields['entities_id']; } - $initial_creation = static::isNewID($ID) && !$this->hasSavedInput(); + $initial_creation = static::isNewID($ID) && $this->hasSavedInput(); $this->restoreInputAndDefaults($ID, $options, null, true); From acadf923dd7785c12f35a03545c0c0f8b8b80f06 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Wed, 26 Feb 2025 14:06:01 +0100 Subject: [PATCH 5/6] rename var --- src/Ticket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ticket.php b/src/Ticket.php index 2344e2dbabd..731cd8b539e 100644 --- a/src/Ticket.php +++ b/src/Ticket.php @@ -4301,7 +4301,7 @@ public function showForm($ID, array $options = []) $options['entities_id'] = $item->fields['entities_id']; } - $initial_creation = static::isNewID($ID) && $this->hasSavedInput(); + $is_promoted = static::isNewID($ID) && $this->hasSavedInput(); $this->restoreInputAndDefaults($ID, $options, null, true); @@ -4320,7 +4320,7 @@ public function showForm($ID, array $options = []) $options['_skip_promoted_fields'] = false; } - if ($initial_creation) { + if ($is_promoted) { // Override some values only for the initial load of a new ticket // Override defaut values from projecttask if needed if (isset($options['_projecttasks_id'])) { From 4faf9f28d3aced6b379c3e917e4745048bdcedd7 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Thu, 6 Mar 2025 14:25:14 +0100 Subject: [PATCH 6/6] fix: add ticket content from promoted followup --- src/CommonITILObject.php | 12 ++++++++++++ src/Ticket.php | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/CommonITILObject.php b/src/CommonITILObject.php index bda8042b73f..a92ba15df3f 100644 --- a/src/CommonITILObject.php +++ b/src/CommonITILObject.php @@ -382,6 +382,18 @@ public function getActorsForType(int $actortype = 1, array $params = []): array ]); } } + + $groups_id = array_key_exists('_groups_id_' . $actortypestring, $params) && $params['_groups_id_' . $actortypestring] > 0 + ? $params['_groups_id_' . $actortypestring] : 0; + if ($groups_id > 0) { + $group_obj = new Group(); + if ($group_obj->getFromDB($groups_id)) { + $fn_add_actor('Group', $groups_id, [ + 'text' => $group_obj->getName(), + 'title' => $group_obj->getRawCompleteName(), + ]); + } + } } // load default actors from itiltemplate passed from showForm in `params` var diff --git a/src/Ticket.php b/src/Ticket.php index 731cd8b539e..ff738da987a 100644 --- a/src/Ticket.php +++ b/src/Ticket.php @@ -4301,8 +4301,6 @@ public function showForm($ID, array $options = []) $options['entities_id'] = $item->fields['entities_id']; } - $is_promoted = static::isNewID($ID) && $this->hasSavedInput(); - $this->restoreInputAndDefaults($ID, $options, null, true); if (isset($options['content'])) { @@ -4320,7 +4318,7 @@ public function showForm($ID, array $options = []) $options['_skip_promoted_fields'] = false; } - if ($is_promoted) { + if (static::isNewID($ID)) { // Override some values only for the initial load of a new ticket // Override defaut values from projecttask if needed if (isset($options['_projecttasks_id'])) {