From eaefbf99c8183f543c766272fc1a73480d28e004 Mon Sep 17 00:00:00 2001
From: Prateek Saxena <prtksxna@gmail.com>
Date: Sun, 23 Jul 2017 06:10:42 +0530
Subject: [PATCH] UserPager: Use multiple checkboxes instead of multiselect

The URL from the serialized form was something like:

    &wpoptions%5B%5D=editsOnly

whereas we needed:

    &editsOnly=1

Bug: T171332
Change-Id: Iaec223195e121dab83b5605a3dfaffa8e1f93684
---
 includes/specials/pagers/UsersPager.php | 39 +++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php
index 7fa03bae34..10baadfca6 100644
--- a/includes/specials/pagers/UsersPager.php
+++ b/includes/specials/pagers/UsersPager.php
@@ -275,17 +275,6 @@ class UsersPager extends AlphabeticPager {
 			$groupOptions[ $groupText ] = $group;
 		}
 
-		$optionsDefault = [];
-		if ( $this->editsOnly ) {
-			$optionsDefault[] = 'editsOnly';
-		}
-		if ( $this->creationSort ) {
-			$optionsDefault[] = 'creationSort';
-		}
-		if ( $this->mDefaultDirection ) {
-			$optionsDefault[] = 'desc';
-		}
-
 		$formDescriptor = [
 			'user' => [
 				'class' => 'HTMLUserTextField',
@@ -300,14 +289,26 @@ class UsersPager extends AlphabeticPager {
 				'class' => 'HTMLSelectField',
 				'options' => $groupOptions,
 			],
-			'options' => [
-				'class' => 'HTMLMultiSelectField',
-				'options' => [
-					$this->msg( 'listusers-editsonly' )->text() => 'editsOnly',
-					$this->msg( 'listusers-creationsort' )->text() => 'creationSort',
-					$this->msg( 'listusers-desc' )->text() => 'desc'
-				],
-				'default' => $optionsDefault
+			'editsOnly' => [
+				'type' => 'check',
+				'label' => $this->msg( 'listusers-editsonly' )->text(),
+				'name' => 'editsOnly',
+				'id' => 'editsOnly',
+				'value' => $this->editsOnly
+			],
+			'creationSort' => [
+				'type' => 'check',
+				'label' => $this->msg( 'listusers-creationsort' )->text(),
+				'name' => 'creationSort',
+				'id' => 'creationSort',
+				'value' => $this->creationSort
+			],
+			'desc' => [
+				'type' => 'check',
+				'label' => $this->msg( 'listusers-desc' )->text(),
+				'name' => 'desc',
+				'id' => 'desc',
+				'value' => $this->mDefaultDirection
 			],
 			'limithiddenfield' => [
 				'class' => 'HTMLHiddenField',
-- 
2.20.1