Skip to content

[pull] rel-11_0 from RotherOSS:rel-11_0 #255

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

Merged
pull merged 3 commits into from
Jun 18, 2026
Merged

[pull] rel-11_0 from RotherOSS:rel-11_0 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9ff3be
Issue #5675: Backport unit test fix.
stefanhaerter Jun 18, 2026
10f8407
Merge branch 'rel-10_1' into rel-11_0
MichaelThumes Jun 18, 2026
967124b
Issue #5620: Use version_createby for user name selection.
stefanhaerter Jun 18, 2026
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
6 changes: 3 additions & 3 deletions Kernel/System/Ticket/ArticleFeatures.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ?",
Expand Down Expand Up @@ -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} ],
);
Expand Down Expand Up @@ -777,7 +777,7 @@ sub IsArticleEdited {
Limit => 1
);

while ( my @Row = $DBObject->FetchrowArray() ) {
while ( $DBObject->FetchrowArray() ) {
$IsEdited = 1;
}

Expand Down
6 changes: 2 additions & 4 deletions scripts/test/Selenium/Agent/FormDraft/AgentTicketForwardDraft.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading