jenkins-bot has submitted this change and it was merged. Change subject: Remove 'Other' option from drop down menu ......................................................................
Remove 'Other' option from drop down menu Removed 'Other' option from drop down menu as it does not really serve any purpose. Code courtesy: Tony Thomas <[email protected]> Bug: T103813 Change-Id: I5fb1c83889bb99f9e4fa41bbe1da52c37d367fd2 --- M includes/SpecialNewsletters.php 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: 01tonythomas: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/SpecialNewsletters.php b/includes/SpecialNewsletters.php index be4375a..7b979d7 100644 --- a/includes/SpecialNewsletters.php +++ b/includes/SpecialNewsletters.php @@ -42,6 +42,7 @@ __METHOD__ ); $newsletterNames = array(); + $defaultOption = array( '' => null ); foreach( $res as $row ) { $newsletterNames[$row->nl_name] = $row->nl_name; } @@ -49,9 +50,9 @@ return array( 'available-newsletters' => array( 'required' => true, - 'type' => 'selectorother', + 'type' => 'select', 'label' => $this->msg( 'available-newsletters-field-label' )->text(), - 'options' => $newsletterNames, + 'options' => array_merge( $defaultOption, $newsletterNames ), ), 'subscriber' => array( 'type' => 'hidden', @@ -123,6 +124,7 @@ } $newsletterNames = array(); + $defaultOption = array( '' => null ); //get newsletter names foreach ( $newsletterIds as $value ) { $result = $dbr->select( @@ -138,9 +140,9 @@ return array( 'subscribed-newsletters' => array( 'required' => true, - 'type' => 'selectorother', + 'type' => 'select', 'label' => $this->msg( 'subscribed-newsletters-field-label' )->text(), - 'options' => $newsletterNames + 'options' => array_merge( $defaultOption, $newsletterNames ) ), 'un-subscriber' => array( 'type' => 'hidden', -- To view, visit https://gerrit.wikimedia.org/r/221118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5fb1c83889bb99f9e4fa41bbe1da52c37d367fd2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Tinaj1234 <[email protected]> Gerrit-Reviewer: 01tonythomas <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Qgil <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
