Better order of form elements (dropdowns together, filter ID last)

Bug: T159061
Change-Id: I7ea1d30f4ed57f014b7df43fa04957b1348428e6
This commit is contained in:
Huji Lee 2018-02-24 19:04:31 -05:00 committed by Huji
parent 24a2518f02
commit 43530957e7

View file

@ -174,13 +174,6 @@ class SpecialAbuseLog extends SpecialPage {
],
],
];
if ( self::canSeeDetails() ) {
$formDescriptor['SearchFilter'] = [
'label-message' => 'abusefilter-log-search-filter',
'type' => 'text',
'default' => $this->mSearchFilter,
];
}
$options = [
$this->msg( 'abusefilter-log-noactions' )->text() => 'noactions',
$this->msg( 'abusefilter-log-search-action-taken-any' )->text() => '',
@ -195,15 +188,6 @@ class SpecialAbuseLog extends SpecialPage {
'type' => 'select',
'options' => $options,
];
if ( $wgAbuseFilterIsCentral ) {
// Add free form input for wiki name. Would be nice to generate
// a select with unique names in the db at some point.
$formDescriptor['SearchWiki'] = [
'label-message' => 'abusefilter-log-search-wiki',
'type' => 'text',
'default' => $this->mSearchWiki,
];
}
if ( self::canSeeHidden() ) {
$formDescriptor['SearchEntries'] = [
'type' => 'select',
@ -215,6 +199,22 @@ class SpecialAbuseLog extends SpecialPage {
],
];
}
if ( self::canSeeDetails() ) {
$formDescriptor['SearchFilter'] = [
'label-message' => 'abusefilter-log-search-filter',
'type' => 'text',
'default' => $this->mSearchFilter,
];
}
if ( $wgAbuseFilterIsCentral ) {
// Add free form input for wiki name. Would be nice to generate
// a select with unique names in the db at some point.
$formDescriptor['SearchWiki'] = [
'label-message' => 'abusefilter-log-search-wiki',
'type' => 'text',
'default' => $this->mSearchWiki,
];
}
$htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() )
->setWrapperLegendMsg( 'abusefilter-log-search' )