From b8d6797c4e641220887ddf83208f5d3275d54d07 Mon Sep 17 00:00:00 2001
From: Pramith Dayananda <pramithd@catalyst.net.nz>
Date: Wed, 15 Nov 2017 17:22:44 +1300
Subject: [PATCH] Bug 1731404: fix suspended/ expired user select

fixed following:
jQuery get user type from dropdown usertype_type
the list does not work if no pagination needed

behatnotneeded

Change-Id: I2da46141bd3c12969ab5523b5c822cd85978b8e9
---
 htdocs/admin/users/suspended.php | 2 +-
 htdocs/js/paginator.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/users/suspended.php b/htdocs/admin/users/suspended.php
index 09b1d720d7..3237a0483c 100644
--- a/htdocs/admin/users/suspended.php
+++ b/htdocs/admin/users/suspended.php
@@ -127,7 +127,7 @@ jQuery(function ($) {
             'offset': 0,
             'sesskey': config['sesskey'],
             'setlimit': true,
-            'type': $('usertype_type').value,
+            'type': $('#usertype_type option:selected').val(),
         };
         p.sendQuery(params);
         event.preventDefault();
diff --git a/htdocs/js/paginator.js b/htdocs/js/paginator.js
index 5ab0f093f7..dfdbefb4ae 100644
--- a/htdocs/js/paginator.js
+++ b/htdocs/js/paginator.js
@@ -220,7 +220,7 @@ return function(id, list, heading, script, extradata) {
             if (firstLink.length) {
                 firstLink.focus();
             }
-            else if (results.length) {
+            else if (results && results.length > 0) {
                 results.prop('tabindex', -1)
                     .addClass('hidefocus')
                     .focus();
-- 
GitLab