yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add user cards to group pages

This commit is contained in:
Hugh Rundle 2021-09-24 21:24:06 +10:00
parent 264d9b2f3c
commit 86a60d58e5
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bookwyrm/templates/groups/group.html
View File

@ -13,19 +13,34 @@
</div> </div>
{% endif %} {% endif %}
{% if not members.object_list.exists %} {% if not group.members.exists %}
<p>{% trans "This group has no members" %}</p> <p>{% trans "This group has no members" %}</p>
{% else %} {% else %}
<ol start="{{ members.start_index }}" class="ordered-list"> <h2 class="heading">Group Members</h2>
{% for member in members %} <ul start="{{ members.start_index }}" class="ordered-list">
{% for member in group.members.all %}
<li class="block mb-5"> <li class="block mb-5">
<div class="card"> <div class="column is-one-third">
<p>member.username</p> {% include 'directory/user_card.html' %}
</div>
</div> </div>
</li> </li>
{% endfor %} {% endfor %}
</ol> </ul>
{% endif %}
{% if not group.lists.exists %}
<p>{% trans "This group has no lists" %}</p>
{% else %}
<h2 class="heading">Lists</h2>
<ul start="{{ lists.start_index }}" class="ordered-list">
{% for list in group.lists.all %}
<li class="block mb-5">
<!-- TODO: make these proper list cards -->
<div class="card">
<a href={{ member.local_path }}>{{ list.name }}</a>
</div>
</li>
{% endfor %}
</ul>
{% endif %} {% endif %}
{% include "snippets/pagination.html" with page=items %} {% include "snippets/pagination.html" with page=items %}
</section> </section>

15
bookwyrm/views/group.py
View File

@ -41,17 +41,6 @@ class Group(View):
} }
return TemplateResponse(request, "groups/group.html", data) return TemplateResponse(request, "groups/group.html", data)
# @method_decorator(login_required, name="dispatch")
# # pylint: disable=unused-argument
# def post(self, request):
# """create a book_list"""
# form = forms.ListForm(request.POST)
# if not form.is_valid():
# return redirect("lists")
# book_list = form.save()
# return redirect(book_list.local_path)
@method_decorator(login_required, name="dispatch") @method_decorator(login_required, name="dispatch")
class UserGroups(View): class UserGroups(View):
"""a user's groups page""" """a user's groups page"""
@ -59,9 +48,7 @@ class UserGroups(View):
def get(self, request, username): def get(self, request, username):
"""display a group""" """display a group"""
user = get_user_from_username(request.user, username) user = get_user_from_username(request.user, username)
# groups = models.GroupMember.objects.filter(user=user)
groups = models.Group.objects.filter(members=user) groups = models.Group.objects.filter(members=user)
# groups = privacy_filter(request.user, groups)
paginated = Paginator(groups, 12) paginated = Paginator(groups, 12)
data = { data = {
@ -83,4 +70,6 @@ def create_group(request):
return redirect(request.headers.get("Referer", "/")) return redirect(request.headers.get("Referer", "/"))
group = form.save() group = form.save()
# TODO: add user as group member
models.GroupMember.objects.create(group=group, user=request.user)
return redirect(group.local_path) return redirect(group.local_path)