summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Godwin2022-12-16 17:32:04 -0700
committerAndrew Godwin2022-12-16 17:32:04 -0700
commitbe377653fe209992631b14e5071aedb98e60ee2a (patch)
tree853f29a4ecbe433b528b8b0aa9c95dfa85c464f5
parent00795f119eeb4b8eb1330b7959ca5ef93accc64b (diff)
downloadtakahe-be377653fe209992631b14e5071aedb98e60ee2a.tar.gz
takahe-be377653fe209992631b14e5071aedb98e60ee2a.tar.bz2
takahe-be377653fe209992631b14e5071aedb98e60ee2a.zip
Fix inbound/outbound links
-rw-r--r--activities/views/follows.py8
-rw-r--r--templates/activities/follows.html12
2 files changed, 14 insertions, 6 deletions
diff --git a/activities/views/follows.py b/activities/views/follows.py
index f5f5909..5e14740 100644
--- a/activities/views/follows.py
+++ b/activities/views/follows.py
@@ -53,4 +53,12 @@ class Follows(ListView):
target=self.request.identity, source_id__in=identity_ids
).values_list("source_id", flat=True)
context["inbound"] = self.inbound
+ context["num_inbound"] = Follow.objects.filter(
+ target=self.request.identity,
+ state__in=FollowStates.group_active(),
+ ).count()
+ context["num_outbound"] = Follow.objects.filter(
+ source=self.request.identity,
+ state__in=FollowStates.group_active(),
+ ).count()
return context
diff --git a/templates/activities/follows.html b/templates/activities/follows.html
index bc2db7d..5ee695f 100644
--- a/templates/activities/follows.html
+++ b/templates/activities/follows.html
@@ -5,11 +5,11 @@
{% block content %}
<div class="view-options">
{% if inbound %}
- <a href=".?outbound=true">Your Follows</a>
- <a href=".?outbound=true" class="selected">Follows You</a>
+ <a href=".">Your Follows ({{ num_outbound }})</a>
+ <a href="." class="selected">Follows You ({{ num_inbound }})</a>
{% else %}
- <a href=".?inbound=true" class="selected">Your Follows</a>
- <a href=".?inbound=true">Follows You</a>
+ <a href=".?inbound=true" class="selected">Your Follows ({{ num_outbound }})</a>
+ <a href=".?inbound=true">Follows You ({{ num_inbound }})</a>
{% endif %}
</div>
@@ -35,11 +35,11 @@
<div class="pagination">
{% if page_obj.has_previous %}
- <a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a>
+ <a class="button" href=".?page={{ page_obj.previous_page_number }}{% if inbound %}&amp;inbound=true{% endif %}">Previous Page</a>
{% endif %}
{% if page_obj.has_next %}
- <a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a>
+ <a class="button" href=".?page={{ page_obj.next_page_number }}{% if inbound %}&amp;inbound=true{% endif %}">Next Page</a>
{% endif %}
</div>
{% endblock %}