From 363ac9f926ab81aea6f82a2e3225b9ed95d329c9 Mon Sep 17 00:00:00 2001 From: atm-thibaultf Date: Tue, 12 Sep 2023 13:07:21 +0200 Subject: [PATCH 1/2] NEW CONF allow modify ticket classification even if closed --- htdocs/admin/ticket.php | 15 +++++++++++++++ htdocs/langs/en_US/ticket.lang | 2 ++ htdocs/langs/fr_FR/ticket.lang | 2 ++ htdocs/ticket/card.php | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 0d54c63af0e..03a7d5bb02d 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -600,6 +600,21 @@ print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBetweenAnswers print ''; print ''; +//Allow classification modification even if the ticket is closed +print ''.$langs->trans("TicketsAllowClassificationModificationIfClosed").''; +print ''; +if ($conf->use_javascript_ajax) { + print ajax_constantonoff('TICKET_ALLOW_CLASSIFICATION_MODIFICATION_EVEN_IF_CLOSED'); +} else { + $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); + print $formcategory->selectarray("TICKET_ALLOW_CLASSIFICATION_MODIFICATION_EVEN_IF_CLOSED", $arrval, getDolGlobalString('TICKET_ALLOW_CLASSIFICATION_MODIFICATION_EVEN_IF_CLOSED')); +} +print ''; +print ''; +print $formcategory->textwithpicto('', $langs->trans("TicketsAllowClassificationModificationIfClosedHelp"), 1, 'help'); +print ''; +print ''; + print '
'; print $formcategory->buttonsSaveCancel("Save", '', array(), 0, 'reposition'); diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index ae5e96bb661..194dedf1f32 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -158,6 +158,8 @@ TicketChooseProductCategory=Product category for ticket support TicketChooseProductCategoryHelp=Select the product category of ticket support. This will be used to automatically link a contract to a ticket. TicketUseCaptchaCode=Use graphical code (CAPTCHA) when creating a ticket TicketUseCaptchaCodeHelp=Adds CAPTCHA verification when creating a new ticket. +TicketsAllowClassificationModificationIfClosed=Allow to modify classification of a closed ticket +TicketsAllowClassificationModificationIfClosed=Allow to modify classification (type, ticket group, severity) even if tickets are closed. # # Index & list page diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang index 6e849456452..7a81691bdd9 100644 --- a/htdocs/langs/fr_FR/ticket.lang +++ b/htdocs/langs/fr_FR/ticket.lang @@ -158,6 +158,8 @@ TicketChooseProductCategory=Catégorie de produit pour les tickets TicketChooseProductCategoryHelp=Sélectionnez la catégorie de produit du support de ticket. Celui-ci sera utilisé pour lier automatiquement un contrat à un ticket. TicketUseCaptchaCode=Utiliser le code graphique (CAPTCHA) lors de la création d'un ticket TicketUseCaptchaCodeHelp=Ajoute la vérification CAPTCHA lors de la création d'un nouveau ticket. +TicketsAllowClassificationModificationIfClosed=Permettre la modification de la classification des tickets résolus. +TicketsAllowClassificationModificationIfClosed=Permettre la modification de la classification (type, groupe de ticket et sévérité) même si les tickets sont résolus. # # Index & list page diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 09473a8c617..1af7f382d30 100755 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -1245,7 +1245,7 @@ if ($action == 'create' || $action == 'presend') { print ''; } else { // Button to edit Properties - if (isset($object->status) && $object->status < $object::STATUS_NEED_MORE_INFO && $user->rights->ticket->write) { + if (isset($object->status) && ($object->status < $object::STATUS_NEED_MORE_INFO || !empty($conf->global->TICKET_ALLOW_CLASSIFICATION_MODIFICATION_EVEN_IF_CLOSED)) && $user->rights->ticket->write) { print ' '.img_edit($langs->trans('Modify')).''; } } From 7420d86073ed8c99bc17f5993ec07b93a89d7848 Mon Sep 17 00:00:00 2001 From: atm-thibaultf Date: Tue, 12 Sep 2023 13:15:14 +0200 Subject: [PATCH 2/2] Add help tooltip lang --- htdocs/langs/en_US/ticket.lang | 4 ++-- htdocs/langs/fr_FR/ticket.lang | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index 194dedf1f32..c58930d84f6 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -158,8 +158,8 @@ TicketChooseProductCategory=Product category for ticket support TicketChooseProductCategoryHelp=Select the product category of ticket support. This will be used to automatically link a contract to a ticket. TicketUseCaptchaCode=Use graphical code (CAPTCHA) when creating a ticket TicketUseCaptchaCodeHelp=Adds CAPTCHA verification when creating a new ticket. -TicketsAllowClassificationModificationIfClosed=Allow to modify classification of a closed ticket -TicketsAllowClassificationModificationIfClosed=Allow to modify classification (type, ticket group, severity) even if tickets are closed. +TicketsAllowClassificationModificationIfClosed=Allow to modify classification of closed tickets +TicketsAllowClassificationModificationIfClosedHelp=Allow to modify classification (type, ticket group, severity) even if tickets are closed. # # Index & list page diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang index 7a81691bdd9..d90ed87cba8 100644 --- a/htdocs/langs/fr_FR/ticket.lang +++ b/htdocs/langs/fr_FR/ticket.lang @@ -158,8 +158,8 @@ TicketChooseProductCategory=Catégorie de produit pour les tickets TicketChooseProductCategoryHelp=Sélectionnez la catégorie de produit du support de ticket. Celui-ci sera utilisé pour lier automatiquement un contrat à un ticket. TicketUseCaptchaCode=Utiliser le code graphique (CAPTCHA) lors de la création d'un ticket TicketUseCaptchaCodeHelp=Ajoute la vérification CAPTCHA lors de la création d'un nouveau ticket. -TicketsAllowClassificationModificationIfClosed=Permettre la modification de la classification des tickets résolus. -TicketsAllowClassificationModificationIfClosed=Permettre la modification de la classification (type, groupe de ticket et sévérité) même si les tickets sont résolus. +TicketsAllowClassificationModificationIfClosed=Permettre la modification de la classification des tickets résolus +TicketsAllowClassificationModificationIfClosedHelp=Permettre la modification de la classification (type, groupe de ticket et sévérité) même si les tickets sont résolus. # # Index & list page