LibertaCasa/takahe
Archived
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inbound/outbound links

Browse Source
This commit is contained in:
Andrew Godwin 2022-12-16 17:32:04 -07:00
parent 00795f119e
commit be377653fe
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activities/views/follows.py
View File

@ -53,4 +53,12 @@ class Follows(ListView):
target=self.request.identity, source_id__in=identity_ids target=self.request.identity, source_id__in=identity_ids
).values_list("source_id", flat=True) ).values_list("source_id", flat=True)
context["inbound"] = self.inbound 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 return context

12
templates/activities/follows.html
View File

@ -5,11 +5,11 @@
{% block content %} {% block content %}
<div class="view-options"> <div class="view-options">
{% if inbound %} {% if inbound %}
<a href=".?outbound=true">Your Follows</a> <a href=".">Your Follows ({{ num_outbound }})</a>
<a href=".?outbound=true" class="selected">Follows You</a> <a href="." class="selected">Follows You ({{ num_inbound }})</a>
{% else %} {% else %}
<a href=".?inbound=true" class="selected">Your Follows</a> <a href=".?inbound=true" class="selected">Your Follows ({{ num_outbound }})</a>
<a href=".?inbound=true">Follows You</a> <a href=".?inbound=true">Follows You ({{ num_inbound }})</a>
{% endif %} {% endif %}
</div> </div>
@ -35,11 +35,11 @@
<div class="pagination"> <div class="pagination">
{% if page_obj.has_previous %} {% 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 %} {% endif %}
{% if page_obj.has_next %} {% 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 %} {% endif %}
</div> </div>
{% endblock %} {% endblock %}