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 parent status override with rule using followup template action and status #18773

Merged
merged 9 commits into from
Jan 24, 2025
Merged

Fix parent status override with rule using followup template action and status #18773

merged 9 commits into from
Jan 24, 2025
+179 −10

Conversation

Lainow
Copy link
Contributor

@Lainow Lainow commented Jan 21, 2025 •
edited
Loading

Checklist before requesting a review

Please delete options that are not relevant.

  • I have read the CONTRIBUTING document.
  • I have performed a self-review of my code.
  • I have added tests that prove my fix is effective or that my feature works.
  • This change requires a documentation update.

Description

  • It fixes !35867
  • Here is a brief description of what this PR does

When I have a rule that adds a follow-up template and changes the status, the status defined by my rule is overridden by the default status when a follow-up is added. This creates an inconsistency between the ticket created and the rule supposed to modify it.

Screenshots (if appropriate):

image

@Lainow Lainow changed the title Fix parent status overhide before rule Fix parent status overhide with followup template action Jan 21, 2025
@Lainow Lainow changed the title Fix parent status overhide with followup template action Fix parent status overhide with rule using followup template action and status Jan 21, 2025
@cedric-anne cedric-anne requested a review from Rom1-B January 21, 2025 10:53
stonebuzz
stonebuzz suggested changes Jan 21, 2025
View reviewed changes
src/CommonITILObject.php Outdated Show resolved Hide resolved
src/Features/ParentStatus.php Outdated Show resolved Hide resolved
@stonebuzz
Copy link
Contributor

Can you adapt testDoNotComputeStatusFollowup or create new one to test with RuleTicket

@Lainow Lainow requested a review from stonebuzz January 21, 2025 15:08
Rom1-B
Rom1-B suggested changes Jan 22, 2025
View reviewed changes
phpunit/functional/RuleTicketTest.php Outdated Show resolved Hide resolved
phpunit/functional/TicketTest.php Outdated Show resolved Hide resolved
@Lainow Lainow requested a review from Rom1-B January 22, 2025 15:22
trasher
trasher approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@trasher trasher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cedric-anne cedric-anne added this to the 10.0.18 milestone Jan 23, 2025
@cedric-anne cedric-anne requested a review from orthagh January 23, 2025 10:00
@cedric-anne cedric-anne removed the bug label Jan 23, 2025
@trasher trasher merged commit abd6066 into glpi-project:10.0/bugfixes Jan 24, 2025
8 checks passed
@cedric-anne cedric-anne changed the title Fix parent status overhide with rule using followup template action and status Fix parent status override with rule using followup template action and status Jan 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AdrienClairembault AdrienClairembault AdrienClairembault approved these changes

@cedric-anne cedric-anne cedric-anne approved these changes

@Rom1-B Rom1-B Rom1-B approved these changes

@stonebuzz stonebuzz stonebuzz approved these changes

@trasher trasher trasher approved these changes

@orthagh orthagh Awaiting requested review from orthagh

Assignees

@Lainow Lainow

Labels
enhancement
Projects
None yet
Milestone
10.0.18
Development

Successfully merging this pull request may close these issues.
6 participants
@Lainow @stonebuzz @trasher @Rom1-B @cedric-anne @AdrienClairembault