diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-05-11 15:16:23 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-05-11 15:16:23 +0200 |
| commit | 8729e4acbde0f180a84f73247f6871167682ed37 (patch) | |
| tree | 9a58386ec712138ef9b52cd0ec94a1204de8e107 /src/meetingtools/urls.py | |
| parent | 0b522db9154375916dcd62d7ad33b55d4bb77b3e (diff) | |
new views for listing tags
Diffstat (limited to 'src/meetingtools/urls.py')
| -rw-r--r-- | src/meetingtools/urls.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/meetingtools/urls.py b/src/meetingtools/urls.py index 27980f2..7fc5f6e 100644 --- a/src/meetingtools/urls.py +++ b/src/meetingtools/urls.py @@ -17,17 +17,18 @@ urlpatterns = patterns('', (r'^accounts/login/?$','meetingtools.apps.auth.views.login'), (r'^accounts/login-federated/$','meetingtools.apps.auth.views.accounts_login_federated'), (r'^accounts/logout/$','meetingtools.apps.auth.views.logout'), - (r'^rooms?$','meetingtools.apps.room.views.list'), - (r'^rooms/(.+)(?:\.([^\.]+))?$','meetingtools.apps.room.views.rooms_by_group'), + (r'^rooms?$','meetingtools.apps.room.views.user_rooms'), (r'^go/(\d+)$','meetingtools.apps.room.views.go_by_id'), (r'^go/(.+)$','meetingtools.apps.room.views.go_by_path'), + (r'^launch/(\d+)$','meetingtools.apps.room.views.launch'), + (r'^promote/(\d+)$','meetingtools.apps.room.views.promote_and_launch'), (r'^room/create$','meetingtools.apps.room.views.create'), (r'^room/(\d+)$','meetingtools.apps.room.views.view'), (r'^room/(\d+)/modify$','meetingtools.apps.room.views.update'), (r'^room/(\d+)/delete$','meetingtools.apps.room.views.delete'), (r'^room/(\d+)/tag$','meetingtools.apps.room.views.tag'), (r'^room/(\d+)/untag/(.+)$','meetingtools.apps.room.views.untag'), - (r'^\+(.+)','meetingtools.apps.room.views.list_by_tag'), + (r'^room/\+(.+)','meetingtools.apps.room.views.list_by_tag'), # Uncomment the admin/doc line below to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), |