group membership invitations
- fix display of group information on user and group pages - send, receive, accept and reject invitations
This commit is contained in:
@ -24,7 +24,7 @@
|
||||
|
||||
{% block panel %}
|
||||
<section class="block">
|
||||
<form name="create-group" method="post" action="{% url 'user-groups' request.user.name %}" class="box is-hidden" id="create_group">
|
||||
<form name="create-group" method="post" action="{% url 'user-groups' request.user.username %}" class="box is-hidden" id="create_group">
|
||||
<header class="columns">
|
||||
<h3 class="title column">{% trans "Create group" %}</h3>
|
||||
<div class="column is-narrow">
|
||||
@ -34,9 +34,9 @@
|
||||
{% include 'groups/form.html' %}
|
||||
</form>
|
||||
|
||||
{% include 'groups/user_groups.html' %}
|
||||
{% include 'groups/user_groups.html' with memberships=memberships %}
|
||||
</section>
|
||||
<div>
|
||||
{% include 'snippets/pagination.html' with page=user_groups path=path %}
|
||||
{% include 'snippets/pagination.html' with page=user.memberships path=path %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
@ -4,6 +4,7 @@
|
||||
{% load utilities %}
|
||||
{% load markdown %}
|
||||
{% load layout %}
|
||||
{% load bookwyrm_group_tags %}
|
||||
|
||||
{% block title %}{{ user.display_name }}{% endblock %}
|
||||
|
||||
@ -75,7 +76,7 @@
|
||||
<a href="{{ url }}">{% trans "Lists" %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if is_self or user.bookwyrm_groups %}
|
||||
{% if is_self or user|has_groups %}
|
||||
{% url 'user-groups' user|username as url %}
|
||||
<li{% if url in request.path %} class="is-active"{% endif %}>
|
||||
<a href="{{ url }}">{% trans "Groups" %}</a>
|
||||
|
Reference in New Issue
Block a user