From 0cec81f76f07c98f70e956e15a0677490461867e Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Sat, 17 Apr 2021 17:14:23 +0200
Subject: [PATCH] Send only emails to deactivate_users

---
 advlabdb/routes.py            | 10 +++++-----
 advlabdb/templates/users.html | 11 ++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/advlabdb/routes.py b/advlabdb/routes.py
index 49afdd9..36b4330 100644
--- a/advlabdb/routes.py
+++ b/advlabdb/routes.py
@@ -212,10 +212,9 @@ def users():
 @app.route("/deactivate_users", methods=["GET"])
 @roles_required("admin")
 def deactivate_users():
-    usersJson = json.loads(request.args.get("json"))
+    usersEmails = json.loads(request.args.get("json"))
     deactivatedUsersEmails = []
-    for userJson in usersJson:
-        email = userJson["email"]
+    for email in usersEmails:
         user = User.query.filter(User.email == email).first()
         if user == current_user:
             flash("You have tried to deactivate yourself as user!", "danger")
@@ -223,10 +222,11 @@ def deactivate_users():
         if user_datastore.deactivate_user(user):
             deactivatedUsersEmails.append(email)
             db.session.commit()
-    if deactivatedUsersEmails == []:
+    deactivatedUsersEmailsLen = len(deactivatedUsersEmails)
+    if deactivatedUsersEmailsLen == 0:
         flash(f"No users deactivated!", "warning")
     else:
-        flash(f"Users with emails {deactivatedUsersEmails} deactivated!", "success")
+        flash(f"{deactivatedUsersEmailsLen} Users with emails {deactivatedUsersEmails} deactivated!", "success")
     return redirect(url_for("users"))
 
 
diff --git a/advlabdb/templates/users.html b/advlabdb/templates/users.html
index 289475d..f3a0fde 100644
--- a/advlabdb/templates/users.html
+++ b/advlabdb/templates/users.html
@@ -14,12 +14,17 @@
 
 {% block scripts %}
 <script>
-  var $table = $('#usersTab')
-  var $button = $('#deactivateUsersButton')
+  let $table = $('#usersTab')
+  let $button = $('#deactivateUsersButton')
 
   $(function() {
     $button.click(function () {
-      window.location.href = '{{url_for("deactivate_users")}}?json=' + JSON.stringify($table.bootstrapTable('getSelections'))
+      let users = $table.bootstrapTable('getSelections');
+      let emails = [];
+      for (var i=0; i<users.length; i++) {
+        emails.push(users[i]["email"])
+      }
+      window.location.href = '{{url_for("deactivate_users")}}?json=' + JSON.stringify(emails);
     })
   })
 </script>