From 8add25ac27a5d59f08a5029ae37806db603bbde9 Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Thu, 8 Sep 2022 07:20:30 +0100 Subject: [PATCH] Fix drilldown modal --- core/templates/base.html | 4 ++-- core/templates/window-content/drilldown.html | 8 ++++---- core/views/ui/drilldown.py | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/templates/base.html b/core/templates/base.html index fca32c5..2f6fc60 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -177,8 +177,8 @@ } .panel-block { - overflow-y:scroll; - overflow-x:scroll; + overflow-y:auto; + overflow-x:auto; min-height: 90%; display: block; } diff --git a/core/templates/window-content/drilldown.html b/core/templates/window-content/drilldown.html index 863866a..71819fb 100644 --- a/core/templates/window-content/drilldown.html +++ b/core/templates/window-content/drilldown.html @@ -46,7 +46,7 @@ {{ channel }} - {% if nick in num_chans %} + {% if channel in num_users %} {{ num_users|index:channel }} @@ -62,7 +62,7 @@ {{ user }} - {% if channel in num_users %} + {% if user in num_chans %} {{ num_chans|index:user }} @@ -78,7 +78,7 @@ {{ user }} - {% if channel in num_users %} + {% if user in num_chans %} {{ num_chans|index:user }} @@ -94,7 +94,7 @@ {{ channel }} - {% if nick in num_chans %} + {% if channel in num_users %} {{ num_users|index:channel }} diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py index 7e1e324..8051c04 100644 --- a/core/views/ui/drilldown.py +++ b/core/views/ui/drilldown.py @@ -453,17 +453,23 @@ class ThresholdInfoModal(APIView): # hash_lookup(request.user, SAFE_PARAMS) channels = get_chans(net, [nick]) + print("CHANNELS", channels) users = get_users(net, [nick]) + print("USERS", users) num_users = annotate_num_users(net, channels) + print("NUM_USERS", num_users) num_chans = annotate_num_chans(net, users) + print("NUM_CHANS", num_chans) if channels: inter_users = get_users(net, channels) else: inter_users = [] + print("INTER_USERS", inter_users) if users: inter_chans = get_chans(net, users) else: inter_chans = [] + print("INTER_CHANS", inter_chans) # if settings.HASHING: # hash_list(request.user, inter_chans) # hash_list(request.user, inter_users) @@ -493,4 +499,5 @@ class ThresholdInfoModal(APIView): "num_chans": num_chans, "unique": unique, } + print("CON", context) return render(request, self.template_name, context)