Ignore:
Timestamp:
Dec 26, 2011, 5:18:13 AM (15 years ago)
Author:
asa-db <asa-db@…>
Branches:
master, space-access, stable, stage
Children:
beaf731
Parents:
be7c915 (diff), e499677 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
asa-db <asa-db@…> (12/26/11 05:18:13)
git-committer:
asa-db <asa-db@…> (12/26/11 05:18:13)
Message:

Merge branch 'master' of /mit/asa-db/Scripts/django/../git/asa-db

File:
1 edited

Legend:

Unmodified
Added
Removed
  • asadb/template/groups/groups_signatories.html

    rce7fd92 re499677  
    2929{%for group, role_list in officers %}
    3030<tr>
    31     <th><a href='{% url groups:group-detail group.pk %}'>{{group}}</a></th>
     31    <th><a href='{% url groups:group-detail group.pk %}'>{{group}}</a> ({{group.group_status}})</th>
    3232    {%for holders in role_list%}
    3333    <td>{% if holders %}<ul>{% for person in holders %}<li>{{person}}</li>{%endfor%}</ul>{% endif %}</td>
Note: See TracChangeset for help on using the changeset viewer.