diff --git a/groups/views.py b/groups/views.py index 4442163..30c9000 100644 --- a/groups/views.py +++ b/groups/views.py @@ -53,7 +53,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, status, requestable, fixed, pending)) + group_list.append((group.id, group.name, group.description, status, requestable, fixed, pending)) return render_to_response('groups/group_list.html', locals(), context_instance=RequestContext(request)) diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html index c508bf0..ebd0ae0 100644 --- a/templates/groups/group_list.html +++ b/templates/groups/group_list.html @@ -9,9 +9,9 @@ {% if group_list %} -{% for id, group, status, requestable, fixed, pending in group_list %} +{% for id, group, description, status, requestable, fixed, pending in group_list %} - +
Group NameDescriptionStatusActions
{{ group }}{{ group.description }}{{ description }} {% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %} {% ifequal status None %}{% if requestable %}Request Membership{% endif %}{% endifequal %} {% if not fixed and status %}Leave {% endif %}