Pathogen
/
neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix drilldown modal

This commit is contained in:
Mark Veidemanis 2022-09-08 07:20:30 +01:00
parent 816ed2665b
commit 8add25ac27
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/templates/base.html
View File

@ -177,8 +177,8 @@
} }
.panel-block { .panel-block {
overflow-y:scroll; overflow-y:auto;
overflow-x:scroll; overflow-x:auto;
min-height: 90%; min-height: 90%;
display: block; display: block;
} }

8
core/templates/window-content/drilldown.html
View File

@ -46,7 +46,7 @@
<i class="fa-solid fa-hashtag" aria-hidden="true"></i> <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
</span> </span>
{{ channel }} {{ channel }}
{% if nick in num_chans %} {% if channel in num_users %}
<span class="tag"> <span class="tag">
{{ num_users|index:channel }} {{ num_users|index:channel }}
</span> </span>
@ -62,7 +62,7 @@
<i class="fa-solid fa-user" aria-hidden="true"></i> <i class="fa-solid fa-user" aria-hidden="true"></i>
</span> </span>
{{ user }} {{ user }}
{% if channel in num_users %} {% if user in num_chans %}
<span class="tag"> <span class="tag">
{{ num_chans|index:user }} {{ num_chans|index:user }}
</span> </span>
@ -78,7 +78,7 @@
<i class="fa-solid fa-user" aria-hidden="true"></i> <i class="fa-solid fa-user" aria-hidden="true"></i>
</span> </span>
{{ user }} {{ user }}
{% if channel in num_users %} {% if user in num_chans %}
<span class="tag"> <span class="tag">
{{ num_chans|index:user }} {{ num_chans|index:user }}
</span> </span>
@ -94,7 +94,7 @@
<i class="fa-solid fa-hashtag" aria-hidden="true"></i> <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
</span> </span>
{{ channel }} {{ channel }}
{% if nick in num_chans %} {% if channel in num_users %}
<span class="tag"> <span class="tag">
{{ num_users|index:channel }} {{ num_users|index:channel }}
</span> </span>

7
core/views/ui/drilldown.py
View File

@ -453,17 +453,23 @@ class ThresholdInfoModal(APIView):
# hash_lookup(request.user, SAFE_PARAMS) # hash_lookup(request.user, SAFE_PARAMS)
channels = get_chans(net, [nick]) channels = get_chans(net, [nick])
print("CHANNELS", channels)
users = get_users(net, [nick]) users = get_users(net, [nick])
print("USERS", users)
num_users = annotate_num_users(net, channels) num_users = annotate_num_users(net, channels)
print("NUM_USERS", num_users)
num_chans = annotate_num_chans(net, users) num_chans = annotate_num_chans(net, users)
print("NUM_CHANS", num_chans)
if channels: if channels:
inter_users = get_users(net, channels) inter_users = get_users(net, channels)
else: else:
inter_users = [] inter_users = []
print("INTER_USERS", inter_users)
if users: if users:
inter_chans = get_chans(net, users) inter_chans = get_chans(net, users)
else: else:
inter_chans = [] inter_chans = []
print("INTER_CHANS", inter_chans)
# if settings.HASHING: # if settings.HASHING:
# hash_list(request.user, inter_chans) # hash_list(request.user, inter_chans)
# hash_list(request.user, inter_users) # hash_list(request.user, inter_users)
@ -493,4 +499,5 @@ class ThresholdInfoModal(APIView):
"num_chans": num_chans, "num_chans": num_chans,
"unique": unique, "unique": unique,
} }
print("CON", context)
return render(request, self.template_name, context) return render(request, self.template_name, context)