From 0036c35c11f6bc3ebf8934f45a5a5f10ce5f9433 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Mon, 7 Sep 2015 18:52:08 -0700
Subject: [PATCH] Hide hidden users from users table

* Show all users when entering "Edit mode"
* Hide hidden users when exiting "Edit mode"
---
 data/interfaces/default/js/tables/users.js |  7 +++++++
 data/interfaces/default/users.html         | 18 +++++++++---------
 plexpy/users.py                            |  5 ++++-
 plexpy/webserve.py                         |  7 ++++---
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index 9bce6b76..2e6b3b9a 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -184,6 +184,13 @@ users_list_table_options = {
             $('.edit-control').each(function () {
                 $(this).removeClass('hidden');
             });
+            $('.edit-control > .edit-user-toggles').each(function () {
+                $(this).children('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+            });
+            $('.edit-user-control > .edit-user-name').each(function () {
+                $(this).children('a').addClass('hidden');
+                $(this).children('input').removeClass('hidden');
+            });
         }
     },
     "preDrawCallback": function(settings) {
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index b493f997..77c45725 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -72,11 +72,15 @@
 <script src="interfaces/default/js/tables/users.js"></script>
 <script>
     $(document).ready(function () {
+        filtered_users = true;
         users_list_table_options.ajax = {
             "url": "get_user_list",
             type: "post",
             data: function ( d ) {
-                return { 'json_data': JSON.stringify( d ) };
+                return {
+                    'filtered_users': filtered_users,
+                    'json_data': JSON.stringify(d)
+                };
             }
         }
 
@@ -89,6 +93,8 @@
             $('#users-to-delete').html('');
 
             if ($(this).hasClass('active')) {
+                filtered_users = true;
+                users_list_table.ajax.reload();
                 if (users_to_purge.length > 0) {
                     $('.edit-control').each(function () {
                         $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
@@ -129,14 +135,8 @@
 
             } else {
                 users_to_purge = [];
-                $('.edit-control').each(function () {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    $(this).removeClass('hidden');
-                });
-                $('.edit-user-control > .edit-user-name').each(function () {
-                    $(this).children('a').addClass('hidden');
-                    $(this).children('input').removeClass('hidden');
-                });
+                filtered_users = false;
+                users_list_table.ajax.reload();
             }
         });
     });
diff --git a/plexpy/users.py b/plexpy/users.py
index 79f76bf0..1eaf36ff 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -21,7 +21,7 @@ class Users(object):
     def __init__(self):
         pass
 
-    def get_user_list(self, kwargs=None):
+    def get_user_list(self, filtered_users=False, kwargs=None):
         data_tables = datatables.DataTables()
 
         columns = ['session_history.id',
@@ -72,6 +72,9 @@ class Users(object):
 
         rows = []
         for item in users:
+            if filtered_users and item["show_user"] == 0:
+                continue
+
             if item["media_type"] == 'episode' and item["parent_thumb"]:
                 thumb = item["parent_thumb"]
             elif item["media_type"] == 'episode':
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index c5a49c5d..91040b22 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -255,10 +255,11 @@ class WebInterface(object):
         return serve_template(templatename="ip_address_modal.html", title="IP Address Details", data=ip_address)
 
     @cherrypy.expose
-    def get_user_list(self, **kwargs):
-
+    def get_user_list(self, filtered_users=False, **kwargs):
+        filtered_users = filtered_users == 'true'
+        
         user_data = users.Users()
-        user_list = user_data.get_user_list(kwargs=kwargs)
+        user_list = user_data.get_user_list(filtered_users=filtered_users, kwargs=kwargs)
 
         cherrypy.response.headers['Content-type'] = 'application/json'
         return json.dumps(user_list)