diff options
Diffstat (limited to '97suifangqa/apps/sciblog/urls.py')
| -rw-r--r-- | 97suifangqa/apps/sciblog/urls.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/97suifangqa/apps/sciblog/urls.py b/97suifangqa/apps/sciblog/urls.py index 722984b..47559d4 100644 --- a/97suifangqa/apps/sciblog/urls.py +++ b/97suifangqa/apps/sciblog/urls.py @@ -1,7 +1,10 @@ +# -*- coding: utf-8 -*- + from django.conf.urls import patterns, url -from .models import SciBlog, BlogAnnotation -from .views import * +from sciblog.models import SciBlog, BlogAnnotation +from sciblog.views import * + blog_blocks = '|'.join(['source','abstract', 'knowledge','follow', 'results', 'comment','refrences', 'test','results-detail']) urlpatterns = patterns('', @@ -11,7 +14,17 @@ urlpatterns = patterns('', url(r'^query/?$', query, name='query_blogs'), url(r'^collection/?$', blog_collection, name='blog_collection'), url(r'^(\d+)/(%s)?/?$' % blog_blocks, blog_detail, name='blog_detail'), - url(r'^(\d+)/collect/?$', add_user_to_m2m, name='blog_collect', kwargs={'m2m':'collected_by'}), - url(r'^(\d+)/understand/?$', add_user_to_m2m, name='blog_understood', kwargs={'m2m':'catched_by'}), - url(r'^annotation/(\d+)/collect/?$', add_user_to_m2m, name='annotation_collect', kwargs={'m2m':'collected_by', 'model': BlogAnnotation}), - ) + url(r'^(?P<objid>\d+)/collect/?$', + add_user_to_m2m, + name='blog_collect', + kwargs={'m2m':'collected_by', 'model': SciBlog}), + url(r'^(?P<objid>\d+)/understand/?$', + add_user_to_m2m, + name='blog_understood', + kwargs={'m2m':'catched_by', 'model': SciBlog}), + url(r'^annotation/(?P<objid>\d+)/collect/?$', + add_user_to_m2m, + name='annotation_collect', + kwargs={'m2m':'collected_by', 'model': BlogAnnotation}), +) + |