Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16454 from edx/bmedx/django111_urls_lms_2

Browse Source 
LMS urls cleanup pt. 2
This commit is contained in:
Brian Mesick
2017-11-06 16:59:34 -05:00
committed by GitHub
parent 5332b6920f 11a4030767
commit 6a336c0c6f
25 changed files with 171 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/djangoapps/badges/api/urls.py
View File

@@ -2,11 +2,10 @@
URLs for badges API
"""
from django.conf import settings
from django.conf.urls import patterns, url
from django.conf.urls import url
from .views import UserBadgeAssertions
urlpatterns = patterns(
'badges.api',
urlpatterns = [
url('^assertions/user/' + settings.USERNAME_PATTERN + '/$', UserBadgeAssertions.as_view(), name='user_assertions'),
)
]

14
lms/djangoapps/branding/api_urls.py
View File

@@ -2,14 +2,10 @@
Branding API endpoint urls.
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
urlpatterns = patterns(
"",
from branding.views import footer
url(
r"^footer$",
"branding.views.footer",
name="branding_footer",
),
)
urlpatterns = [
url(r"^footer$", footer, name="branding_footer"),
]

7
lms/djangoapps/bulk_enroll/urls.py
View File

@@ -1,11 +1,10 @@
"""
URLs for the Bulk Enrollment API
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
from bulk_enroll.views import BulkEnrollView
urlpatterns = patterns(
'bulk_enroll.views',
urlpatterns = [
url(r'^bulk_enroll', BulkEnrollView.as_view(), name='bulk_enroll'),
)
]

11
lms/djangoapps/ccx/api/urls.py
View File

@@ -1,7 +1,8 @@
""" CCX API URLs. """
from django.conf.urls import include, patterns, url
"""
CCX API URLs.
"""
from django.conf.urls import include, url
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^v0/', include('lms.djangoapps.ccx.api.v0.urls', namespace='v0')),
)
]

17
lms/djangoapps/ccx/api/v0/urls.py
View File

@@ -1,19 +1,18 @@
""" CCX API v0 URLs. """
"""
CCX API v0 URLs.
"""
from django.conf import settings
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from lms.djangoapps.ccx.api.v0 import views
CCX_COURSE_ID_PATTERN = settings.COURSE_ID_PATTERN.replace('course_id', 'ccx_course_id')
CCX_URLS = patterns(
'',
CCX_URLS = [
url(r'^$', views.CCXListView.as_view(), name='list'),
url(r'^{}/?$'.format(CCX_COURSE_ID_PATTERN), views.CCXDetailView.as_view(), name='detail'),
)
]
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^ccx/', include(CCX_URLS, namespace='ccx')),
)
]

39
lms/djangoapps/ccx/urls.py
View File

@@ -1,31 +1,22 @@
"""
URLs for the CCX Feature.
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
urlpatterns = patterns(
'',
url(r'^ccx_coach$',
'ccx.views.dashboard', name='ccx_coach_dashboard'),
url(r'^create_ccx$',
'ccx.views.create_ccx', name='create_ccx'),
url(r'^save_ccx$',
'ccx.views.save_ccx', name='save_ccx'),
url(r'^ccx_invite$',
'ccx.views.ccx_invite', name='ccx_invite'),
url(r'^ccx_schedule$',
'ccx.views.ccx_schedule', name='ccx_schedule'),
url(r'^ccx_manage_student$',
'ccx.views.ccx_student_management', name='ccx_manage_student'),
import ccx.views
urlpatterns = [
url(r'^ccx_coach$', ccx.views.dashboard, name='ccx_coach_dashboard'),
url(r'^create_ccx$', ccx.views.create_ccx, name='create_ccx'),
url(r'^save_ccx$', ccx.views.save_ccx, name='save_ccx'),
url(r'^ccx_invite$', ccx.views.ccx_invite, name='ccx_invite'),
url(r'^ccx_schedule$', ccx.views.ccx_schedule, name='ccx_schedule'),
url(r'^ccx_manage_student$', ccx.views.ccx_student_management, name='ccx_manage_student'),
# Grade book
url(r'^ccx_gradebook$',
'ccx.views.ccx_gradebook', name='ccx_gradebook'),
url(r'^ccx_gradebook/(?P<offset>[0-9]+)$',
'ccx.views.ccx_gradebook', name='ccx_gradebook'),
url(r'^ccx_gradebook$', ccx.views.ccx_gradebook, name='ccx_gradebook'),
url(r'^ccx_gradebook/(?P<offset>[0-9]+)$', ccx.views.ccx_gradebook, name='ccx_gradebook'),
url(r'^ccx_grades.csv$',
'ccx.views.ccx_grades_csv', name='ccx_grades_csv'),
url(r'^ccx_set_grading_policy$',
'ccx.views.set_grading_policy', name='ccx_set_grading_policy'),
)
url(r'^ccx_grades.csv$', ccx.views.ccx_grades_csv, name='ccx_grades_csv'),
url(r'^ccx_set_grading_policy$', ccx.views.set_grading_policy, name='ccx_set_grading_policy'),
]

11
lms/djangoapps/certificates/apis/urls.py
View File

@@ -1,7 +1,8 @@
""" Certificates API URLs. """
from django.conf.urls import include, patterns, url
"""
Certificates API URLs.
"""
from django.conf.urls import include, url
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^v0/', include('lms.djangoapps.certificates.apis.v0.urls', namespace='v0')),
)
]

17
lms/djangoapps/certificates/apis/v0/urls.py
View File

@@ -1,12 +1,12 @@
""" Certificates API v0 URLs. """
"""
Certificates API v0 URLs.
"""
from django.conf import settings
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from lms.djangoapps.certificates.apis.v0 import views
CERTIFICATES_URLS = patterns(
'',
CERTIFICATES_URLS = [
url(
r'^{username}/courses/{course_id}/$'.format(
username=settings.USERNAME_PATTERN,
@@ -14,9 +14,8 @@ CERTIFICATES_URLS = patterns(
),
views.CertificatesDetailView.as_view(), name='detail'
),
)
]
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^certificates/', include(CERTIFICATES_URLS, namespace='certificates')),
)
]

9
lms/djangoapps/certificates/urls.py
View File

@@ -1,15 +1,12 @@
"""
URLs for the certificates app.
"""
from django.conf import settings
from django.conf.urls import patterns, url
from django.conf.urls import url
from certificates import views
urlpatterns = patterns(
'',
urlpatterns = [
# Certificates HTML view end point to render web certs by user and course
url(
r'^user/(?P<user_id>[^/]*)/course/{course_id}'.format(course_id=settings.COURSE_ID_PATTERN),
@@ -30,4 +27,4 @@ urlpatterns = patterns(
url(r'search', views.search_certificates, name="search"),
url(r'regenerate', views.regenerate_certificate_for_user, name="regenerate_certificate_for_user"),
url(r'generate', views.generate_certificate_for_user, name="generate_certificate_for_user"),
)
]

24
lms/djangoapps/class_dashboard/urls.py
View File

@@ -1,35 +1,35 @@
"""
Class Dashboard API endpoint urls.
"""
from django.conf import settings
from django.conf.urls import patterns, url
from django.conf.urls import url
import class_dashboard.views
import class_dashboard.dashboard_data
COURSE_ID_PATTERN = settings.COURSE_ID_PATTERN
urlpatterns = patterns(
'',
urlpatterns = [
# Json request data for metrics for entire course
url(r'^{}/all_sequential_open_distrib$'.format(settings.COURSE_ID_PATTERN),
'class_dashboard.views.all_sequential_open_distrib', name="all_sequential_open_distrib"),
class_dashboard.views.all_sequential_open_distrib, name="all_sequential_open_distrib"),
url(r'^{}/all_problem_grade_distribution$'.format(settings.COURSE_ID_PATTERN),
'class_dashboard.views.all_problem_grade_distribution', name="all_problem_grade_distribution"),
class_dashboard.views.all_problem_grade_distribution, name="all_problem_grade_distribution"),
# Json request data for metrics for particular section
url(r'^{}/problem_grade_distribution/(?P<section>\d+)$'.format(settings.COURSE_ID_PATTERN),
'class_dashboard.views.section_problem_grade_distrib', name="section_problem_grade_distrib"),
class_dashboard.views.section_problem_grade_distrib, name="section_problem_grade_distrib"),
# For listing students that opened a sub-section
url(r'^get_students_opened_subsection$',
'class_dashboard.dashboard_data.get_students_opened_subsection', name="get_students_opened_subsection"),
class_dashboard.dashboard_data.get_students_opened_subsection, name="get_students_opened_subsection"),
# For listing of students' grade per problem
url(r'^get_students_problem_grades$',
'class_dashboard.dashboard_data.get_students_problem_grades', name="get_students_problem_grades"),
class_dashboard.dashboard_data.get_students_problem_grades, name="get_students_problem_grades"),
# For generating metrics data as a csv
url(r'^post_metrics_data_csv_url',
'class_dashboard.dashboard_data.post_metrics_data_csv', name="post_metrics_data_csv"),
)
class_dashboard.dashboard_data.post_metrics_data_csv, name="post_metrics_data_csv"),
]

11
lms/djangoapps/commerce/api/urls.py
View File

@@ -1,8 +1,9 @@
""" API URLs. """
from django.conf.urls import include, patterns, url
"""
API URLs.
"""
from django.conf.urls import include, url
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^v0/', include('commerce.api.v0.urls', namespace='v0')),
url(r'^v1/', include('commerce.api.v1.urls', namespace='v1')),
)
]

16
lms/djangoapps/commerce/api/v0/urls.py
View File

@@ -1,15 +1,15 @@
""" API v0 URLs. """
from django.conf.urls import include, patterns, url
"""
API v0 URLs.
"""
from django.conf.urls import include, url
from commerce.api.v0 import views
BASKET_URLS = patterns(
'',
BASKET_URLS = [
url(r'^$', views.BasketsView.as_view(), name='create'),
url(r'^(?P<basket_id>[\w]+)/order/$', views.BasketOrderView.as_view(), name='retrieve_order'),
)
]
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^baskets/', include(BASKET_URLS, namespace='baskets')),
)
]

17
lms/djangoapps/commerce/api/v1/urls.py
View File

@@ -1,22 +1,19 @@
""" API v1 URLs. """
from django.conf import settings
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from commerce.api.v1 import views
COURSE_URLS = patterns(
'',
COURSE_URLS = [
url(r'^$', views.CourseListView.as_view(), name='list'),
url(r'^{}/$'.format(settings.COURSE_ID_PATTERN), views.CourseRetrieveUpdateView.as_view(), name='retrieve_update'),
)
]
ORDER_URLS = patterns(
'',
ORDER_URLS = [
url(r'^(?P<number>[-\w]+)/$', views.OrderView.as_view(), name='detail'),
)
]
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^courses/', include(COURSE_URLS, namespace='courses')),
url(r'^orders/', include(ORDER_URLS, namespace='orders')),
)
]

8
lms/djangoapps/commerce/urls.py
View File

@@ -1,15 +1,13 @@
"""
Defines the URL routes for this app.
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
from commerce import views
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^checkout/cancel/$', views.checkout_cancel, name='checkout_cancel'),
url(r'^checkout/error/$', views.checkout_error, name='checkout_error'),
url(r'^checkout/receipt/$', views.checkout_receipt, name='checkout_receipt'),
url(r'^checkout/verification_status/$', views.user_verification_status, name='user_verification_status'),
)
]

7
lms/djangoapps/course_api/blocks/urls.py
View File

@@ -2,12 +2,11 @@
Course Block API URLs
"""
from django.conf import settings
from django.conf.urls import patterns, url
from django.conf.urls import url
from .views import BlocksInCourseView, BlocksView
urlpatterns = patterns(
'',
urlpatterns = [
# This endpoint requires the usage_key for the starting block.
url(
r'^v1/blocks/{}'.format(settings.USAGE_KEY_PATTERN),
@@ -21,4 +20,4 @@ urlpatterns = patterns(
BlocksInCourseView.as_view(),
name="blocks_in_course"
),
)
]

7
lms/djangoapps/course_api/urls.py
View File

@@ -2,13 +2,12 @@
Course API URLs
"""
from django.conf import settings
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from .views import CourseDetailView, CourseListView
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^v1/courses/$', CourseListView.as_view(), name="course-list"),
url(r'^v1/courses/{}'.format(settings.COURSE_KEY_PATTERN), CourseDetailView.as_view(), name="course-detail"),
url(r'', include('course_api.blocks.urls'))
)
]

7
lms/djangoapps/course_goals/urls.py
View File

@@ -1,7 +1,7 @@
"""
Course Goals URLs
"""
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from rest_framework import routers
from .views import CourseGoalViewSet
@@ -9,7 +9,6 @@ from .views import CourseGoalViewSet
router = routers.DefaultRouter()
router.register(r'course_goals', CourseGoalViewSet, base_name='course_goal')
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^v0/', include(router.urls, namespace='v0')),
)
]

7
lms/djangoapps/course_structure_api/urls.py
View File

@@ -3,9 +3,8 @@ Course Structure API URI specification.
Patterns here should simply point to version-specific patterns.
"""
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^v0/', include('course_structure_api.v0.urls', namespace='v0'))
)
]

7
lms/djangoapps/course_structure_api/v0/urls.py
View File

@@ -2,14 +2,13 @@
Courses Structure API v0 URI specification
"""
from django.conf import settings
from django.conf.urls import patterns, url
from django.conf.urls import url
from course_structure_api.v0 import views
COURSE_ID_PATTERN = settings.COURSE_ID_PATTERN
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^courses/$', views.CourseList.as_view(), name='list'),
url(r'^courses/{}/$'.format(COURSE_ID_PATTERN), views.CourseDetail.as_view(), name='detail'),
url(r'^course_structures/{}/$'.format(COURSE_ID_PATTERN), views.CourseStructure.as_view(), name='structure'),
@@ -18,4 +17,4 @@ urlpatterns = patterns(
views.CourseGradingPolicy.as_view(),
name='grading_policy'
),
)
]

7
lms/djangoapps/dashboard/sysadmin_urls.py
View File

@@ -2,16 +2,15 @@
Urls for sysadmin dashboard feature
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
from dashboard import sysadmin
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^$', sysadmin.Users.as_view(), name="sysadmin"),
url(r'^courses/?$', sysadmin.Courses.as_view(), name="sysadmin_courses"),
url(r'^staffing/?$', sysadmin.Staffing.as_view(), name="sysadmin_staffing"),
url(r'^gitlogs/?$', sysadmin.GitLogs.as_view(), name="gitlogs"),
url(r'^gitlogs/(?P<course_id>.+)$', sysadmin.GitLogs.as_view(),
name="gitlogs_detail"),
)
]

23
lms/djangoapps/discussion/urls.py
View File

@@ -1,21 +1,20 @@
"""
Forum urls for the django_comment_client.
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
from .views import DiscussionBoardFragmentView
from discussion import views
urlpatterns = patterns(
'discussion.views',
url(r'users/(?P<user_id>\w+)/followed$', 'followed_threads', name='followed_threads'),
url(r'users/(?P<user_id>\w+)$', 'user_profile', name='user_profile'),
url(r'^(?P<discussion_id>[\w\-.]+)/threads/(?P<thread_id>\w+)$', 'single_thread', name='single_thread'),
url(r'^(?P<discussion_id>[\w\-.]+)/inline$', 'inline_discussion', name='inline_discussion'),
urlpatterns = [
url(r'users/(?P<user_id>\w+)/followed$', views.followed_threads, name='followed_threads'),
url(r'users/(?P<user_id>\w+)$', views.user_profile, name='user_profile'),
url(r'^(?P<discussion_id>[\w\-.]+)/threads/(?P<thread_id>\w+)$', views.single_thread,
name='single_thread'),
url(r'^(?P<discussion_id>[\w\-.]+)/inline$', views.inline_discussion, name='inline_discussion'),
url(
r'discussion_board_fragment_view$',
DiscussionBoardFragmentView.as_view(),
views.DiscussionBoardFragmentView.as_view(),
name='discussion_board_fragment_view'
),
url(r'', 'forum_form_discussion', name='forum_form_discussion'),
)
url(r'', views.forum_form_discussion, name='forum_form_discussion'),
]

7
lms/djangoapps/discussion_api/urls.py
View File

@@ -2,7 +2,7 @@
Discussion API URLs
"""
from django.conf import settings
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from rest_framework.routers import SimpleRouter
from discussion_api.views import CommentViewSet, CourseTopicsView, CourseView, ThreadViewSet
@@ -11,8 +11,7 @@ ROUTER = SimpleRouter()
ROUTER.register("threads", ThreadViewSet, base_name="thread")
ROUTER.register("comments", CommentViewSet, base_name="comment")
urlpatterns = patterns(
"discussion_api",
urlpatterns = [
url(
r"^v1/courses/{}".format(settings.COURSE_ID_PATTERN),
CourseView.as_view(),
@@ -24,4 +23,4 @@ urlpatterns = patterns(
name="course_topics"
),
url("^v1/", include(ROUTER.urls)),
)
]

65
lms/djangoapps/django_comment_client/base/urls.py
View File

@@ -1,36 +1,39 @@
"""
Base urls for the django_comment_client.
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
urlpatterns = patterns(
'django_comment_client.base.views',
from django_comment_client.base import views
url(r'upload$', 'upload', name='upload'),
url(r'threads/(?P<thread_id>[\w\-]+)/update$', 'update_thread', name='update_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/reply$', 'create_comment', name='create_comment'),
url(r'threads/(?P<thread_id>[\w\-]+)/delete', 'delete_thread', name='delete_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/upvote$', 'vote_for_thread', {'value': 'up'}, name='upvote_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/downvote$', 'vote_for_thread', {'value': 'down'}, name='downvote_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/flagAbuse$', 'flag_abuse_for_thread', name='flag_abuse_for_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unFlagAbuse$', 'un_flag_abuse_for_thread', name='un_flag_abuse_for_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unvote$', 'undo_vote_for_thread', name='undo_vote_for_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/pin$', 'pin_thread', name='pin_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unpin$', 'un_pin_thread', name='un_pin_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/follow$', 'follow_thread', name='follow_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unfollow$', 'unfollow_thread', name='unfollow_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/close$', 'openclose_thread', name='openclose_thread'),
url(r'comments/(?P<comment_id>[\w\-]+)/update$', 'update_comment', name='update_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/endorse$', 'endorse_comment', name='endorse_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/reply$', 'create_sub_comment', name='create_sub_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/delete$', 'delete_comment', name='delete_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/upvote$', 'vote_for_comment', {'value': 'up'}, name='upvote_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/downvote$', 'vote_for_comment', {'value': 'down'}, name='downvote_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/unvote$', 'undo_vote_for_comment', name='undo_vote_for_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/flagAbuse$', 'flag_abuse_for_comment', name='flag_abuse_for_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/unFlagAbuse$', 'un_flag_abuse_for_comment', name='un_flag_abuse_for_comment'),
url(r'^(?P<commentable_id>[\w\-.]+)/threads/create$', 'create_thread', name='create_thread'),
url(r'^(?P<commentable_id>[\w\-.]+)/follow$', 'follow_commentable', name='follow_commentable'),
url(r'^(?P<commentable_id>[\w\-.]+)/unfollow$', 'unfollow_commentable', name='unfollow_commentable'),
url(r'users$', 'users', name='users'),
)
urlpatterns = [
url(r'upload$', views.upload, name='upload'),
url(r'threads/(?P<thread_id>[\w\-]+)/update$', views.update_thread, name='update_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/reply$', views.create_comment, name='create_comment'),
url(r'threads/(?P<thread_id>[\w\-]+)/delete', views.delete_thread, name='delete_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/upvote$', views.vote_for_thread, {'value': 'up'}, name='upvote_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/downvote$', views.vote_for_thread, {'value': 'down'}, name='downvote_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/flagAbuse$', views.flag_abuse_for_thread, name='flag_abuse_for_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unFlagAbuse$', views.un_flag_abuse_for_thread,
name='un_flag_abuse_for_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unvote$', views.undo_vote_for_thread, name='undo_vote_for_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/pin$', views.pin_thread, name='pin_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unpin$', views.un_pin_thread, name='un_pin_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/follow$', views.follow_thread, name='follow_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/unfollow$', views.unfollow_thread, name='unfollow_thread'),
url(r'threads/(?P<thread_id>[\w\-]+)/close$', views.openclose_thread, name='openclose_thread'),
url(r'comments/(?P<comment_id>[\w\-]+)/update$', views.update_comment, name='update_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/endorse$', views.endorse_comment, name='endorse_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/reply$', views.create_sub_comment, name='create_sub_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/delete$', views.delete_comment, name='delete_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/upvote$', views.vote_for_comment, {'value': 'up'}, name='upvote_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/downvote$', views.vote_for_comment, {'value': 'down'},
name='downvote_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/unvote$', views.undo_vote_for_comment, name='undo_vote_for_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/flagAbuse$', views.flag_abuse_for_comment, name='flag_abuse_for_comment'),
url(r'comments/(?P<comment_id>[\w\-]+)/unFlagAbuse$', views.un_flag_abuse_for_comment,
name='un_flag_abuse_for_comment'),
url(r'^(?P<commentable_id>[\w\-.]+)/threads/create$', views.create_thread, name='create_thread'),
url(r'^(?P<commentable_id>[\w\-.]+)/follow$', views.follow_commentable, name='follow_commentable'),
url(r'^(?P<commentable_id>[\w\-.]+)/unfollow$', views.unfollow_commentable, name='unfollow_commentable'),
url(r'users$', views.users, name='users'),
]

8
lms/djangoapps/django_comment_client/urls.py
View File

@@ -1,10 +1,8 @@
"""
Urls for the django_comment_client.
"""
from django.conf.urls import include, patterns, url
urlpatterns = patterns(
'',
from django.conf.urls import include, url
urlpatterns = [
url(r'', include('django_comment_client.base.urls')),
)
]

17
lms/djangoapps/edxnotes/urls.py
View File

@@ -1,13 +1,14 @@
"""
URLs for EdxNotes.
"""
from django.conf.urls import patterns, url
from django.conf.urls import url
from edxnotes import views
# Additionally, we include login URLs for the browseable API.
urlpatterns = patterns(
"edxnotes.views",
url(r"^/$", "edxnotes", name="edxnotes"),
url(r"^/notes/$", "notes", name="notes"),
url(r"^/token/$", "get_token", name="get_token"),
url(r"^/visibility/$", "edxnotes_visibility", name="edxnotes_visibility"),
)
urlpatterns = [
url(r"^/$", views.edxnotes, name="edxnotes"),
url(r"^/notes/$", views.notes, name="notes"),
url(r"^/token/$", views.get_token, name="get_token"),
url(r"^/visibility/$", views.edxnotes_visibility, name="edxnotes_visibility"),
]