From b9ff3bec9f2932f8c704c80ce786efb991e73603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20H=C3=A4rter?= Date: Thu, 18 Jun 2026 07:18:32 +0200 Subject: [PATCH 1/2] Issue #5675: Backport unit test fix. --- .../test/Selenium/Agent/FormDraft/AgentTicketForwardDraft.t | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/test/Selenium/Agent/FormDraft/AgentTicketForwardDraft.t b/scripts/test/Selenium/Agent/FormDraft/AgentTicketForwardDraft.t index 632d5ec8b1..02c9483ebf 100644 --- a/scripts/test/Selenium/Agent/FormDraft/AgentTicketForwardDraft.t +++ b/scripts/test/Selenium/Agent/FormDraft/AgentTicketForwardDraft.t @@ -440,10 +440,8 @@ $Selenium->RunTest( ); $Selenium->find_element( "#DeleteConfirm", 'css' )->click(); - $Selenium->WaitFor( - JavaScript => - 'return typeof($) === "function" && $(".FormDraftDelete").length == 0;' - ) || die 'FormDraft was not deleted!'; + $Selenium->WaitFor( AlertPresent => 1 ); + $Selenium->accept_alert(); # Delete created test ticket. my $Success = $TicketObject->TicketDelete( From 967124b451387bf608db66b7620ba215bfbdb549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20H=C3=A4rter?= Date: Thu, 18 Jun 2026 09:54:59 +0200 Subject: [PATCH 2/2] Issue #5620: Use version_createby for user name selection. Otherwise, every version in the dropdown carries the name of the user which created the article. --- Kernel/System/Ticket/ArticleFeatures.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/System/Ticket/ArticleFeatures.pm b/Kernel/System/Ticket/ArticleFeatures.pm index 8cc7f6700e..c50fe7aade 100644 --- a/Kernel/System/Ticket/ArticleFeatures.pm +++ b/Kernel/System/Ticket/ArticleFeatures.pm @@ -301,7 +301,7 @@ sub ArticleVersion { Bind => [ \$Param{TicketID}, \$Param{ArticleID} ] ); - #Rollback if error ocurrs when backing up history_id <> article_id relation + #Rollback if error occurs when backing up history_id <> article_id relation if ( !$Success ) { $DBObject->Do( SQL => "DELETE FROM article_version WHERE id = ?", @@ -722,7 +722,7 @@ sub VersionHistoryGet { $DBObject->Prepare( SQL => "SELECT sh.id, sh.version_create_time, usr.first_name, usr.last_name, sh.version_create_by FROM article_version sh, users usr WHERE - sh.ticket_id = ? AND sh.source_article_id = ? AND sh.create_by = usr.id AND sh.article_delete <> 1 + sh.ticket_id = ? AND sh.source_article_id = ? AND sh.version_create_by = usr.id AND sh.article_delete <> 1 ORDER BY sh.id asc", Bind => [ \$Param{TicketID}, \$Param{ArticleID} ], ); @@ -777,7 +777,7 @@ sub IsArticleEdited { Limit => 1 ); - while ( my @Row = $DBObject->FetchrowArray() ) { + while ( $DBObject->FetchrowArray() ) { $IsEdited = 1; }