diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-02-25 13:10:16 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-02-25 13:10:16 +0100 |
| commit | 4b38484d691a44720fb3ac08d7d304dd31cf04de (patch) | |
| tree | 4eb6b0db3ace957d8b382cbb3a695c804fef7c3d | |
| parent | ba4c3e87087ec6d3d3da333c2f0d34f486da2b23 (diff) | |
json view for names
| -rw-r--r-- | coip/apps/name/views.py | 3 | ||||
| -rw-r--r-- | coip/urls.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py index 9a3ce03..21c658e 100644 --- a/coip/apps/name/views.py +++ b/coip/apps/name/views.py @@ -150,7 +150,8 @@ def show(request,name): memberships = name.memberships invitations = name.invitations return respond_to(request, - {'text/html': 'apps/name/name.html'}, + {'text/html': 'apps/name/name.html', + 'application/json': json_response({'name': name.display, 'url': name.url(), 'short': name.short}) }, {'name': name, 'memberships':memberships, 'invitations':invitations}) diff --git a/coip/urls.py b/coip/urls.py index 9904b6e..af51813 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -32,12 +32,12 @@ urlpatterns = patterns('', (r'^invitation/(?P<id>[0-9]+)/resend$', 'coip.apps.invitation.views.resend'), (r'^invitation/(?P<nonce>[^\/]+)/accept$', 'coip.apps.invitation.views.accept'), # Names - (r'^name/id/(?P<id>[0-9]+)$', 'coip.apps.name.views.show_by_id'), + (r'^name/id/(?P<id>[0-9]+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_id'), (r'^name$', 'coip.apps.name.views.show_root'), (r'^name/(?P<id>[0-9]+)/edit$', 'coip.apps.name.views.edit'), (r'^name/(?P<id>[0-9]+)/delete$', 'coip.apps.name.views.delete'), (r'^name/(?P<id>[0-9]+)/add$', 'coip.apps.name.views.add'), - (r'^name/(?P<name>.+)$', 'coip.apps.name.views.show_by_name'), + (r'^name/(?P<name>.+)(?:\.([^\.]+))?$', 'coip.apps.name.views.show_by_name'), # Name Links (r'^name/(?P<id>[0-9]+)/link/(?P<type>[0-9]+).json$', 'coip.apps.name.views.links'), (r'^namelink/(?P<id>[0-9]+)/remove$', 'coip.apps.name.views.removelink'), |