From 6f9749636cd7498cbd41270dc80e7c1046941ec0 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Thu, 19 May 2011 11:39:39 +0100
Subject: [PATCH] Shows a different link if the group is moderated or not

---
 app/groups/views.py                  | 2 +-
 app/templates/groups/group_list.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/groups/views.py b/app/groups/views.py
index 5a7c085..4c695c3 100644
--- a/app/groups/views.py
+++ b/app/groups/views.py
@@ -49,7 +49,7 @@ def group_list(request):
         fixed = not group.groupinformation.type == GROUP_TYPE_PERMISSION
 	pending = group.requests.filter(status=REQUEST_PENDING,user=request.user).count()
 
-        group_list.append((group.id, group.name, group.groupinformation.description, status, requestable, fixed, pending))
+        group_list.append((group.id, group.name, group.groupinformation.description, status, requestable, fixed, pending, group.groupinformation.moderated))
 
     group_list = sorted(group_list, key=lambda name: name[1].lower())
 
diff --git a/app/templates/groups/group_list.html b/app/templates/groups/group_list.html
index ebd0ae0..8638906 100644
--- a/app/templates/groups/group_list.html
+++ b/app/templates/groups/group_list.html
@@ -9,11 +9,11 @@
 <table>
 {% if group_list %}
 <tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
-{% for id, group, description, status, requestable, fixed, pending in group_list %}
+{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
 <tr><td>{{ group }}</td>
     <td>{{ description }}</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 %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
         {% 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>
 </tr>