Shows if a request is pending

This commit is contained in:
2011-01-10 17:22:44 +00:00
parent 1bca0f76d5
commit 61ba8675ab
2 changed files with 5 additions and 3 deletions

View File

@@ -51,7 +51,9 @@ def group_list(request):
requestable = False requestable = False
fixed = not group.groupinformation.type == GROUP_TYPE_PERMISSION fixed = not group.groupinformation.type == GROUP_TYPE_PERMISSION
group_list.append((group.id, group.name, status, requestable, fixed)) pending = group.requests.filter(status=REQUEST_PENDING,user=request.user).count()
group_list.append((group.id, group.name, status, requestable, fixed, pending))
return render_to_response('groups/group_list.html', locals(), context_instance=RequestContext(request)) return render_to_response('groups/group_list.html', locals(), context_instance=RequestContext(request))

View File

@@ -9,9 +9,9 @@
<table> <table>
{% if group_list %} {% if group_list %}
<tr><th>Group Name</th><th>Status</th><th>Actions</th></tr> <tr><th>Group Name</th><th>Status</th><th>Actions</th></tr>
{% for id, group, status, requestable, fixed in group_list %} {% for id, group, status, requestable, fixed, pending in group_list %}
<tr><td>{{ group }}</td> <tr><td>{{ group }}</td>
<td>{% if status %}{{ status }}{% endif %}</td> <td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
<td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">Request Membership</a>{% endif %}{% endifequal %} <td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">Request Membership</a>{% endif %}{% endifequal %}
{% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %} {% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
{% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td> {% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>