Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Show all error messages on unsuccessful rollback"

Browse source
This commit is contained in:
jenkins-bot 2024-06-03 20:06:04 +00:00 committed by Gerrit Code Review
commit 332b97c9dd
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/actions/RollbackAction.php
View file

@ -191,13 +191,22 @@ class RollbackAction extends FormAction {
throw new ThrottledError; throw new ThrottledError;
} }
if ( $rollbackResult->hasMessage( 'alreadyrolled' ) || $rollbackResult->hasMessage( 'cantrollback' ) ) { # NOTE: Permission errors already handled by Action::checkExecute.
$this->getOutput()->setPageTitleMsg( $this->msg( 'rollbackfailed' ) ); if ( $rollbackResult->hasMessage( 'readonlytext' ) ) {
# XXX: Why are we only showing the first error message, instead of all of them? throw new ReadOnlyError;
$msg = $rollbackResult->getMessages()[0]; }
$this->getOutput()->addWikiMsg( $msg );
if ( isset( $data['current-revision-record'] ) ) { if ( $rollbackResult->getMessages() ) {
$this->getOutput()->setPageTitleMsg( $this->msg( 'rollbackfailed' ) );
foreach ( $rollbackResult->getMessages() as $msg ) {
$this->getOutput()->addWikiMsg( $msg );
}
if (
( $rollbackResult->hasMessage( 'alreadyrolled' ) || $rollbackResult->hasMessage( 'cantrollback' ) )
&& isset( $data['current-revision-record'] )
) {
/** @var RevisionRecord $current */ /** @var RevisionRecord $current */
$current = $data['current-revision-record']; $current = $data['current-revision-record'];
@ -215,17 +224,6 @@ class RollbackAction extends FormAction {
return; return;
} }
# NOTE: Permission errors already handled by Action::checkExecute.
if ( $rollbackResult->hasMessage( 'readonlytext' ) ) {
throw new ReadOnlyError;
}
# XXX: Would be nice if ErrorPageError could take multiple errors, and/or a status object.
# Right now, we only show the first error
foreach ( $rollbackResult->getMessages() as $msg ) {
throw new ErrorPageError( 'rollbackfailed', $msg );
}
/** @var RevisionRecord $current */ /** @var RevisionRecord $current */
$current = $data['current-revision-record']; $current = $data['current-revision-record'];
$target = $data['target-revision-record']; $target = $data['target-revision-record'];