Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 16:46:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Group extension models into a single OneToOne model

Browse Source 
Added group leader field
This commit is contained in:
Basraah
2016-12-04 23:05:04 +10:00
parent 648753a68a
commit bf345361b2
7 changed files with 220 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stock/templates/registered/groupmembership.html
View File

@@ -24,11 +24,11 @@
{% for group in groups %}
<tr>
<td class="text-center">{{ group.name }}</td>
<td class="text-center">{{ group.groupdescription.description }}</td>
<td class="text-center">{{ group.authgroup.description }}</td>
<td class="text-center">
{% if group.hiddengroup %}
{% if group.authgroup.hidden %}
<span class="label label-info">{% trans "Hidden" %}</span>
{% elif group.opengroup %}
{% elif group.authgroup.open %}
<span class="label label-success">{% trans "Open" %}</span>
{% else %}
<span class="label label-default">{% trans "Requestable" %}</span>

26
stock/templates/registered/groups.html
View File

@@ -11,36 +11,36 @@
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
{% if STATE == MEMBER_STATE or user.is_superuser %}
{% if pairs %}
{% if groups %}
<table class="table">
<tr>
<th class="text-center">{% trans "GroupName" %}</th>
<th class="text-center">{% trans "GroupDesc" %}</th>
<th class="text-center">{% trans "Name" %}</th>
<th class="text-center">{% trans "Description" %}</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
{% for pair in pairs %}
{% for g in groups %}
<tr>
<td class="text-center">{{ pair.0.name }}</td>
<td class="text-center">{{ pair.1.description }}</td>
<td class="text-center">{{ g.group.name }}</td>
<td class="text-center">{{ g.group.authgroup.description }}</td>
<td class="text-center">
{% if pair.0 in user.groups.all %}
{% if pair.2 == "" %}
<a href="{% url 'auth_group_request_leave' pair.0.id %}" class="btn btn-danger">
{% if g.group in user.groups.all %}
{% if not g.request %}
<a href="{% url 'auth_group_request_leave' g.group.id %}" class="btn btn-danger">
{% trans "Leave" %}
</a>
{% else %}
<button type="button" class="btn btn-primary" disabled>
{{ pair.2.status }}
{{ g.request.status }}
</button>
{% endif %}
{% elif pair.2 == "" %}
<a href="{% url 'auth_group_request_add' pair.0.id %}" class="btn btn-success">
{% elif not g.request %}
<a href="{% url 'auth_group_request_add' g.group.id %}" class="btn btn-success">
{% trans "Request" %}
</a>
{% else %}
<button type="button" class="btn btn-primary" disabled>
{{ pair.2.status }}
{{ g.request.status }}
</button>
{% endif %}
</td>