Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-10 13:00:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'group-rework' into 'master'

Browse Source 
Make group joins a bit clearer

See merge request allianceauth/allianceauth!1134
This commit is contained in:
Basraah 2019-08-24 22:46:46 +00:00
commit 6e450061f4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
allianceauth/groupmanagement/templates/groupmanagement/groups.html
View File

@ -32,9 +32,15 @@ url
</button> </button>
{% endif %} {% endif %}
{% elif not g.request %} {% elif not g.request %}
<a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success"> {% if g.group.authgroup.open %}
{% trans "Request" %} <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
</a> {% trans "Join" %}
</a>
{% else %}
<a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
{% trans "Request" %}
</a>
{% endif %}
{% else %} {% else %}
<button type="button" class="btn btn-primary" disabled> <button type="button" class="btn btn-primary" disabled>
{{ g.request.status }} {{ g.request.status }}