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

Fix validationresponse ticket close #18380

Merged
merged 12 commits into from
Dec 3, 2024
Merged

Fix validationresponse ticket close #18380

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a5bfc3d
fix-global-approval-status
Lainow Nov 12, 2024
d481383
Fix of the response to a validation request when the ticket is closed
Lainow Nov 25, 2024
a8ec78b
Add suggestion and remove ticket.gotm.php modif
Lainow Nov 25, 2024
88ca8fc
Fix count and saved search in global view
Lainow Nov 25, 2024
235f287
Remove closed ticket to Tickets waiting for validation card
Lainow Nov 26, 2024
3f9d632
Update src/Dashboard/Provider.php
Lainow Nov 27, 2024
e0dcfa4
Fix bad request to count number of tickets waiting for user validation
Lainow Dec 2, 2024
b37c7cf
Add suggestions
Lainow Dec 3, 2024
4e037e6
Implement test
Lainow Dec 3, 2024
72c51ea
Add suggestion
Lainow Dec 3, 2024
10c79e8
Update front/ticket.form.php
cedric-anne Dec 3, 2024
6a63dc0
Apply suggestions from code review
cedric-anne Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions front/ticket.form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,45 @@
if (!$track::canUpdate()) {
Html::displayRightError();
}

cedric-anne marked this conversation as resolved.
Show resolved Hide resolved
if (isset($_POST['validation_percent'])) {
$nb = countElementsInTable(TicketValidation::getTable(), ['tickets_id' => $_POST['id']]);

$rejections = countElementsInTable(TicketValidation::getTable(), [
'tickets_id' => $_POST['id'],
'status' => CommonITILValidation::REFUSED
]);

$validations = countElementsInTable(TicketValidation::getTable(), [
'tickets_id' => $_POST['id'],
'status' => CommonITILValidation::ACCEPTED
]);

if ($rejections == $nb) {
$_POST['global_validation'] = CommonITILValidation::REFUSED;
} else if ($validations > 0) {
switch ($_POST['validation_percent']) {
case 0:
$_POST['global_validation'] = CommonITILValidation::ACCEPTED;
break;
case 100:
if ($rejections > 0) {
$_POST['global_validation'] = CommonITILValidation::REFUSED;
} else {
$_POST['global_validation'] = ($validations == $nb) ? CommonITILValidation::ACCEPTED : CommonITILValidation::WAITING;
}
break;
case 50:
if ($rejections >= $nb / 2) {
$_POST['global_validation'] = CommonITILValidation::REFUSED;
} else {
$_POST['global_validation'] = ($validations >= $nb / 2) ? CommonITILValidation::ACCEPTED : CommonITILValidation::WAITING;
}
break;
}
}
}

$track->update($_POST);

if (isset($_POST['kb_linked_id'])) {
Expand Down
3 changes: 2 additions & 1 deletion src/CommonITILObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7191,7 +7191,8 @@ class_exists($validation_class) && $params['with_validations']

$canedit = $valitation_obj->can($validations_id, UPDATE);
$cananswer = ($validation_row['users_id_validate'] === Session::getLoginUserID() &&
$validation_row['status'] == CommonITILValidation::WAITING);
$validation_row['status'] == CommonITILValidation::WAITING &&
$this->fields['status'] != CommonITILObject::CLOSED);
$user = new User();
$user->getFromDB($validation_row['users_id_validate']);

Expand Down