From 802f957d2240e882386678e671d1f55dfd8e56da Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Wed, 16 Sep 2020 17:36:14 +0100
Subject: [PATCH] fix scrolling on modals spawned by settings modal, fix
 getUsers cache

closing the settings modal to immediately open another caused the
'modal-open' class on the body to get deleted, which meant scrolling
stopped working inside them. Also fix mistake added to jfapi in last commit.
---
 data/templates/admin.html | 27 ++++++++++++++++++++++++---
 jfapi.go                  |  3 +--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/data/templates/admin.html b/data/templates/admin.html
index 344f3e4..fed4ad9 100644
--- a/data/templates/admin.html
+++ b/data/templates/admin.html
@@ -136,6 +136,10 @@
             .settingIcon {
                 margin-left: 0.2rem;
             }
+
+            body.modal-open {
+                overflow: hidden;
+            }
         </style>
         <title>Admin</title>
     </head>
@@ -404,10 +408,23 @@
         <script>
             {{ if .bs5 }}
                 function createModal(id, find = false) {
+                    let modal;
                     if (find) {
-                        return bootstrap.Modal.getInstance(document.getElementById(id));
+                        modal = bootstrap.Modal.getInstance(document.getElementById(id));
+                    } else {
+                        modal = new bootstrap.Modal(document.getElementById(id));
                     }
-                    return new bootstrap.Modal(document.getElementById(id));
+                    document.getElementById(id).addEventListener('shown.bs.modal', function () {
+                        document.body.classList.add("modal-open");
+                    });
+                    return {
+                        modal: modal,
+                        show: function() {
+                            let temp = this.modal.show();
+                            return temp
+                        },
+                        hide: function() { return this.modal.hide(); }
+                    };
                 }
             {{ else }}
                 let send_to_addess_enabled = document.getElementById('send_to_address_enabled');
@@ -419,9 +436,13 @@
                     multiUseEnabled.classList.remove('form-check-input');
                 }
                 function createModal(id, find = false) {
+                    $('#' + id).on('shown.bs.modal', function () {
+                        document.body.classList.add("modal-open");
+                    });
                     return {
                         show: function() {
-                            return $('#' + id).modal('show');
+                            let temp = $('#' + id).modal('show');
+                            return temp
                         },
                         hide: function() {
                             return $('#' + id).modal('hide');
diff --git a/jfapi.go b/jfapi.go
index 5c94c6f..95b5ee2 100644
--- a/jfapi.go
+++ b/jfapi.go
@@ -224,7 +224,6 @@ func (jf *Jellyfin) getUsers(public bool) ([]map[string]interface{}, int, error)
 		if public {
 			url := fmt.Sprintf("%s/users/public", jf.server)
 			data, status, err = jf._get(url, nil)
-
 		} else {
 			url := fmt.Sprintf("%s/users", jf.server)
 			data, status, err = jf._get(url, jf.loginParams)
@@ -237,7 +236,7 @@ func (jf *Jellyfin) getUsers(public bool) ([]map[string]interface{}, int, error)
 		jf.cacheExpiry = time.Now().Add(time.Minute * time.Duration(jf.cacheLength))
 		return result, status, nil
 	}
-	return jf.userCache, status, nil
+	return jf.userCache, 200, nil
 }
 
 func (jf *Jellyfin) userByName(username string, public bool) (map[string]interface{}, int, error) {