Sethakill has uploaded a new change for review.
https://gerrit.wikimedia.org/r/287134
Change subject: Convert Special:DeletedContributions to use OOUI.
......................................................................
Convert Special:DeletedContributions to use OOUI.
Added FormOptions and deleted unnecessary code.
Bug: T134525
Change-Id: Ib57cc928f84f3444f381effe89c13f1aa9b7270f
---
M includes/specials/SpecialDeletedContributions.php
1 file changed, 48 insertions(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/287134/1
diff --git a/includes/specials/SpecialDeletedContributions.php
b/includes/specials/SpecialDeletedContributions.php
index 190bf9f..89d7ebf 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -26,9 +26,11 @@
* @ingroup SpecialPage
*/
class DeletedContributionsPage extends SpecialPage {
+ /** @var FormOptions */
+ protected $mOpts;
+
function __construct() {
- parent::__construct( 'DeletedContributions', 'deletedhistory',
- /*listed*/true, /*function*/false, /*file*/false );
+ parent::__construct( 'DeletedContributions', 'deletedhistory' );
}
/**
@@ -40,40 +42,36 @@
function execute( $par ) {
$this->setHeaders();
$this->outputHeader();
+ $this->checkPermissions();
$user = $this->getUser();
- if ( !$this->userCanExecute( $user ) ) {
- $this->displayRestrictionError();
-
- return;
- }
-
- $request = $this->getRequest();
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 'deletedcontributions-title' )
);
- $options = [];
+ $opts = new FormOptions();
+
+ $opts->add( 'target', '' );
+ $opts->add( 'namespace', '' );
+ $opts->add( 'limit', 20 );
+
+ $opts->fetchValuesFromRequest( $this->getRequest() );
+ $opts->validateIntBounds( 'limit', 0, $this->getConfig()->get(
'QueryPageDefaultLimit' ) );
if ( $par !== null ) {
- $target = $par;
- } else {
- $target = $request->getVal( 'target' );
+ $opts->setValue( 'target', $par );
}
+ $target = $opts->getValue( 'target' );
if ( !strlen( $target ) ) {
- $out->addHTML( $this->getForm( '' ) );
+ $this->getForm();
return;
}
- $options['limit'] = $request->getInt( 'limit',
- $this->getConfig()->get( 'QueryPageDefaultLimit' ) );
- $options['target'] = $target;
-
$userObj = User::newFromName( $target, false );
if ( !$userObj ) {
- $out->addHTML( $this->getForm( '' ) );
+ $this->getForm();
return;
}
@@ -82,16 +80,16 @@
$target = $userObj->getName();
$out->addSubtitle( $this->getSubTitle( $userObj ) );
- $ns = $request->getVal( 'namespace', null );
+ $ns = $opts->getValue( 'namespace' );
if ( $ns !== null && $ns !== '' ) {
- $options['namespace'] = intval( $ns );
- } else {
- $options['namespace'] = '';
+ $opts->setValue( 'namespace', intval( $ns ) );
}
- $out->addHTML( $this->getForm( $options ) );
+ $this->mOpts = $opts;
- $pager = new DeletedContribsPager( $this->getContext(),
$target, $options['namespace'] );
+ $this->getForm();
+
+ $pager = new DeletedContribsPager( $this->getContext(),
$target, $opts->getValue( 'namespace' ) );
if ( !$pager->getNumRows() ) {
$out->addWikiMsg( 'nocontribs' );
@@ -255,76 +253,35 @@
/**
* Generates the namespace selector form with hidden attributes.
- * @param array $options The options to be included.
- * @return string
*/
- function getForm( $options ) {
- $options['title'] = $this->getPageTitle()->getPrefixedText();
- if ( !isset( $options['target'] ) ) {
- $options['target'] = '';
- } else {
- $options['target'] = str_replace( '_', ' ',
$options['target'] );
- }
+ function getForm() {
+ $opts = $this->mOpts;
- if ( !isset( $options['namespace'] ) ) {
- $options['namespace'] = '';
- }
-
- if ( !isset( $options['contribs'] ) ) {
- $options['contribs'] = 'user';
- }
-
- if ( $options['contribs'] == 'newbie' ) {
- $options['target'] = '';
- }
-
- $f = Xml::openElement( 'form', [ 'method' => 'get', 'action' =>
wfScript() ] );
-
- foreach ( $options as $name => $value ) {
- if ( in_array( $name, [ 'namespace', 'target',
'contribs' ] ) ) {
- continue;
- }
- $f .= "\t" . Html::hidden( $name, $value ) . "\n";
- }
-
- $this->getOutput()->addModules( 'mediawiki.userSuggest' );
-
- $f .= Xml::openElement( 'fieldset' );
- $f .= Xml::element( 'legend', [], $this->msg(
'sp-contributions-search' )->text() );
- $f .= Xml::tags(
- 'label',
- [ 'for' => 'target' ],
- $this->msg( 'sp-contributions-username' )->parse()
- ) . ' ';
- $f .= Html::input(
- 'target',
- $options['target'],
- 'text',
- [
- 'size' => '20',
- 'required' => '',
- 'class' => [
- 'mw-autocomplete-user', // used by
mediawiki.userSuggest
- ],
- ] + ( $options['target'] ? [] : [ 'autofocus' ] )
- ) . ' ';
- $f .= Html::namespaceSelector(
- [
- 'selected' => $options['namespace'],
- 'all' => '',
- 'label' => $this->msg( 'namespace' )->text()
+ $formDescriptor = [
+ 'target' => [
+ 'type' => 'user',
+ 'name' => 'target',
+ 'label-message' => 'sp-contributions-username',
+ 'default' => $opts->getValue( 'target' ),
+ 'ipallowed' => true,
],
- [
- 'name' => 'namespace',
- 'id' => 'namespace',
- 'class' => 'namespaceselector',
- ]
- ) . ' ';
- $f .= Xml::submitButton( $this->msg( 'sp-contributions-submit'
)->text() );
- $f .= Xml::closeElement( 'fieldset' );
- $f .= Xml::closeElement( 'form' );
- return $f;
+ 'namespace' => [
+ 'type' => 'namespaceselect',
+ 'name' => 'namespace',
+ 'label-message' => 'namespace',
+ 'all' => '',
+ ],
+ ];
+
+ $form = HTMLForm::factory( 'ooui', $formDescriptor,
$this->getContext() )
+ ->setWrapperLegendMsg( 'sp-contributions-search' )
+ ->setSubmitTextMsg( 'sp-contributions-submit' )
+ // prevent setting subpage and 'target' parameter at
the same time
+ ->setAction( $this->getPageTitle()->getLocalURL() )
+ ->setMethod( 'get' )
+ ->prepareForm()
+ ->displayForm( false );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/287134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib57cc928f84f3444f381effe89c13f1aa9b7270f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sethakill <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
