Changeset fbb362a


Ignore:
Timestamp:
Aug 25, 2011, 10:53:03 PM (14 years ago)
Author:
Alex Dehnert <adehnert@…>
Branches:
master, space-access, stable, stage, test-hooks
Children:
9b391ce, 165e5aa
Parents:
d3167b9
git-author:
Alex Dehnert <adehnert@…> (08/25/11 22:53:03)
git-committer:
Alex Dehnert <adehnert@…> (08/25/11 22:53:03)
Message:

Rearrange URLs

This factors out the common "groups" prefix, makes "groups" be used even for
single-group things, and puts group-related stuff in a single namespace.
(Django is lame, and while nested namespaces work, namespaces with wildcards
in the prefix don't, so I can't make a groups:group namespace, which would be
cute.)

Location:
asadb
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • asadb/groups/views.py

    r9b4e15e rfbb362a  
    111111        model = groups.models.Group
    112112
    113 def manage_main(request, group_id, ):
    114     group = get_object_or_404(groups.models.Group, pk=group_id)
     113def manage_main(request, pk, ):
     114    group = get_object_or_404(groups.models.Group, pk=pk)
    115115
    116116    if not request.user.has_perm('groups.admin_group', group):
    … …  
    245245    def get_queryset(self):
    246246        history_entries = None
    247         if 'group' in self.kwargs:
    248             group = get_object_or_404(groups.models.Group, pk=self.kwargs['group'])
     247        if 'pk' in self.kwargs:
     248            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
    249249            history_entries = reversion.models.Version.objects.get_for_object(group)
    250250        else:
    … …  
    259259    def get_context_data(self, **kwargs):
    260260        context = super(GroupHistoryView, self).get_context_data(**kwargs)
    261         if 'group' in self.kwargs:
    262             group = get_object_or_404(groups.models.Group, pk=self.kwargs['group'])
     261        if 'pk' in self.kwargs:
     262            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
    263263            context['title'] = "History for %s" % (group.name, )
    264264        else:
    … …  
    278278    return people, roles, officers_map
    279279
    280 def manage_officers(request, group_id, ):
    281     group = get_object_or_404(groups.models.Group, pk=group_id)
     280def manage_officers(request, pk, ):
     281    group = get_object_or_404(groups.models.Group, pk=pk)
    282282
    283283    if not request.user.has_perm('groups.admin_group', group):
    … …  
    426426    dest = None
    427427    if 'signatories' in request.GET:
    428         dest = reverse('groups-signatories')
     428        dest = reverse('groups:signatories')
    429429        print dest
    430430    elif 'group-info' in request.GET:
    431         dest = reverse('group-list')
     431        dest = reverse('groups:list')
    432432
    433433    if dest:

  • asadb/template/base.html

    r386ea2a rfbb362a  
    1212    <ul class='tab-navigation'>
    1313        <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url homepage   %}">Home</a></li>
    14         <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url group-list %}">Groups</a></li>
     14        <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url groups:list %}">Groups</a></li>
    1515        <li{% ifequal pagename "fysm"     %} class='selected'{% endifequal %}><a href="{% url fysm       %}">FYSM</a></li>
    1616        {% if user.is_staff %}<li><a href='{% url admin:index %}'>Admin</a></li>{% endif %}

  • asadb/template/groups/group_change_main.html

    rf27faaf rfbb362a  
    2020
    2121<ul>
    22     <li><a href='{% url group-manage-history group.pk %}'>View update history</a></li>
    23     <li><a href='{% url group-manage-officers group.pk %}'>Update officers, signatories, etc.</a></li>
     22    <li><a href='{% url groups:group-manage-history group.pk %}'>View update history</a></li>
     23    <li><a href='{% url groups:group-manage-officers group.pk %}'>Update officers, signatories, etc.</a></li>
    2424</ul>
    2525

  • asadb/template/groups/group_change_officers.html

    r2abe1dc rfbb362a  
    8787
    8888<ul>
    89     <li><a href='{% url group-manage-main group.pk %}'>View main update page</a></li>
    90     <li><a href='{% url group-manage-officers group.pk %}'>Reload this page</a></li>
     89    <li><a href='{% url groups:group-manage-main group.pk %}'>View main update page</a></li>
     90    <li><a href='{% url groups:group-manage-officers group.pk %}'>Reload this page</a></li>
    9191</ul>
    9292

  • asadb/template/groups/group_detail.html

    r3107c52 rfbb362a  
    55
    66<h1>{{group.name}}{% if group.abbreviation %} ({{group.abbreviation}}){%endif%}
    7 {% if adminpriv %}<a href='{%url group-manage-main group.pk %}'>[update]</a></p>{%endif%}
     7{% if adminpriv %}<a href='{%url groups:group-manage-main group.pk %}'>[update]</a></p>{%endif%}
    88</h1>
    99

  • asadb/template/groups/group_list.html

    r1de230f rfbb362a  
    3232        <th>{{group.name}}</th>
    3333        <td>{% if group.website_url %}<a href='{{group.website_url}}'>Website</a>{%endif%}</td>
    34         <td><a href='{% url group-detail group.pk %}'>DB Entry</a></td>
     34        <td><a href='{% url groups:group-detail group.pk %}'>DB Entry</a></td>
    3535        <td>{{group.description}}</td>
    3636        <td>{{group.meeting_times}}</td>

  • asadb/template/groups/group_version.html

    r9f9aa21 rfbb362a  
    1717<tr>
    1818    <td>{{version.object_id}}</td>
    19     <td><a href='{% url group-detail version.object_id %}'>{{version.object_repr}}</a></td>
     19    <td><a href='{% url groups:group-detail version.object_id %}'>{{version.object_repr}}</a></td>
    2020    <td>{{version.revision.date_created}}</td>
    2121    <td>{% if version.revision.user %}{{version.revision.user}}{%else%}<i>System</i>{%endif%}</td>

  • asadb/template/groups/groups_signatories.html

    r9ea4909 rfbb362a  
    4646{%for group, role_list in officers %}
    4747<tr>
    48     <th><a href='{% url group-detail group.pk %}'>{{group}}</a></th>
     48    <th><a href='{% url groups:group-detail group.pk %}'>{{group}}</a></th>
    4949    {%for holders in role_list%}
    5050    <td>{% if holders %}<ul>{% for person in holders %}<li>{{person}}</li>{%endfor%}</ul>{% endif %}</td>

  • asadb/template/index.html

    r6a646ce rfbb362a  
    77
    88<ul>
    9     <li><a href='{%url group-search%}'>Search groups</a></li>
    10     <li><a href='{%url group-list%}'>List of groups</a></li>
     9    <li><a href='{%url groups:search%}'>Search groups</a></li>
     10    <li><a href='{%url groups:list%}'>List of groups</a></li>
    1111    <li>First Year Summer Mailing<ul>
    1212        <li><a href='{%url fysm%}'>View the entries</a></li>
    1313        <li><a href='{%url fysm-select%}'>Submit an entry</a></li>
    1414    </ul></li>
    15     {%if perms.groups.view_signatories %}<li><a href='{% url groups-signatories %}'>View Signatories</a></li>{%endif%}
     15    {%if perms.groups.view_signatories %}<li><a href='{% url groups:signatories %}'>View Signatories</a></li>{%endif%}
    1616</ul>
    1717
    … …  
    2929<ul>
    3030{% for group in groups %}
    31     <li><a href='{% url group-detail group.pk %}'>{{group}}</a></li>
     31    <li><a href='{% url groups:group-detail group.pk %}'>{{group}}</a></li>
    3232{%endfor%}
    3333</ul>

  • asadb/urls.py

    r6a646ce rfbb362a  
    99import settings
    1010
     11import groups.urls
    1112import forms.views
    12 import groups.models
    13 import groups.views
    14 
    1513
    1614urlpatterns = patterns('',
    … …  
    3129    url(r'^fysm/(?:(\d+)/)?(?:([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),
    3230
    33     # Group editing
    34     url(r'^group/(\d+)/edit/main$', groups.views.manage_main, name='group-manage-main', ),
    35     url(r'^group/(\d+)/edit/officers$', groups.views.manage_officers, name='group-manage-officers', ),
    36 
    3731    # Group list
    38     url(r'^groups/$', groups.views.GroupListView.as_view(), name='group-list', ),
    39     url(r'^groups/search/$', groups.views.search_groups, name='group-search', ),
    40     url(r'^group/(?P<pk>\d+)/$', groups.views.GroupDetailView.as_view(), name='group-detail', ),
    41     url(r'^groups/recent_changes/$', groups.views.GroupHistoryView.as_view(), name='groups-manage-history', ),
    42     url(r'^group/(?P<group>\d+)/history/$', groups.views.GroupHistoryView.as_view(), name='group-manage-history', ),
    43     url(r'^groups/signatories/$', groups.views.view_signatories, name='groups-signatories', ),
     32    (r'^groups/', include(groups.urls.urls(), ), ),
    4433
    4534    # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
Note: See TracChangeset for help on using the changeset viewer.