Commit 171f8c2a4a9e20c557b26e26ce28aec40868e767
1 parent
a1215b94
Stopped reversing views by string (reverse or url calls)
Refs #49. This prevents some deprecation warnings on Django 1.9.
Showing
5 changed files
with
33 additions
and
35 deletions
| ... | ... | @@ -70,7 +70,7 @@ def get_form_target(): |
| 70 | 70 | if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"): |
| 71 | 71 | return get_comment_app().get_form_target() |
| 72 | 72 | else: |
| 73 | - return urlresolvers.reverse("django_comments.views.comments.post_comment") | |
| 73 | + return urlresolvers.reverse("comments-post-comment") | |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | def get_flag_url(comment): |
| ... | ... | @@ -80,8 +80,7 @@ def get_flag_url(comment): |
| 80 | 80 | if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"): |
| 81 | 81 | return get_comment_app().get_flag_url(comment) |
| 82 | 82 | else: |
| 83 | - return urlresolvers.reverse("django_comments.views.moderation.flag", | |
| 84 | - args=(comment.id,)) | |
| 83 | + return urlresolvers.reverse("comments-flag", args=(comment.id,)) | |
| 85 | 84 | |
| 86 | 85 | |
| 87 | 86 | def get_delete_url(comment): |
| ... | ... | @@ -91,8 +90,7 @@ def get_delete_url(comment): |
| 91 | 90 | if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"): |
| 92 | 91 | return get_comment_app().get_delete_url(comment) |
| 93 | 92 | else: |
| 94 | - return urlresolvers.reverse("django_comments.views.moderation.delete", | |
| 95 | - args=(comment.id,)) | |
| 93 | + return urlresolvers.reverse("comments-delete", args=(comment.id,)) | |
| 96 | 94 | |
| 97 | 95 | |
| 98 | 96 | def get_approve_url(comment): |
| ... | ... | @@ -102,5 +100,4 @@ def get_approve_url(comment): |
| 102 | 100 | if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"): |
| 103 | 101 | return get_comment_app().get_approve_url(comment) |
| 104 | 102 | else: |
| 105 | - return urlresolvers.reverse("django_comments.views.moderation.approve", | |
| 106 | - args=(comment.id,)) | |
| 103 | + return urlresolvers.reverse("comments-approve", args=(comment.id,)) | ... | ... |
| 1 | 1 | from django.conf.urls import patterns, url |
| 2 | +from django.contrib.contenttypes.views import shortcut | |
| 2 | 3 | |
| 3 | -urlpatterns = patterns('django_comments.views', | |
| 4 | - url(r'^post/$', 'comments.post_comment', name='comments-post-comment'), | |
| 5 | - url(r'^posted/$', 'comments.comment_done', name='comments-comment-done'), | |
| 6 | - url(r'^flag/(\d+)/$', 'moderation.flag', name='comments-flag'), | |
| 7 | - url(r'^flagged/$', 'moderation.flag_done', name='comments-flag-done'), | |
| 8 | - url(r'^delete/(\d+)/$', 'moderation.delete', name='comments-delete'), | |
| 9 | - url(r'^deleted/$', 'moderation.delete_done', name='comments-delete-done'), | |
| 10 | - url(r'^approve/(\d+)/$', 'moderation.approve', name='comments-approve'), | |
| 11 | - url(r'^approved/$', 'moderation.approve_done', name='comments-approve-done'), | |
| 4 | +from .views.comments import post_comment, comment_done | |
| 5 | +from .views.moderation import ( | |
| 6 | + flag, flag_done, delete, delete_done, approve, approve_done, | |
| 7 | +) | |
| 8 | + | |
| 9 | + | |
| 10 | +urlpatterns = patterns('', | |
| 11 | + url(r'^post/$', post_comment, name='comments-post-comment'), | |
| 12 | + url(r'^posted/$', comment_done, name='comments-comment-done'), | |
| 13 | + url(r'^flag/(\d+)/$', flag, name='comments-flag'), | |
| 14 | + url(r'^flagged/$', flag_done, name='comments-flag-done'), | |
| 15 | + url(r'^delete/(\d+)/$', delete, name='comments-delete'), | |
| 16 | + url(r'^deleted/$', delete_done, name='comments-delete-done'), | |
| 17 | + url(r'^approve/(\d+)/$', approve, name='comments-approve'), | |
| 18 | + url(r'^approved/$', approve_done, name='comments-approve-done'), | |
| 12 | 19 | ) |
| 13 | 20 | |
| 14 | 21 | urlpatterns += patterns('', |
| 15 | - url(r'^cr/(\d+)/(.+)/$', 'django.contrib.contenttypes.views.shortcut', | |
| 22 | + url(r'^cr/(\d+)/(.+)/$', shortcut, | |
| 16 | 23 | name='comments-url-redirect'), |
| 17 | 24 | ) | ... | ... |
| 1 | 1 | from django.core import urlresolvers |
| 2 | + | |
| 3 | +from . import views | |
| 2 | 4 | from .forms import CustomCommentForm |
| 3 | 5 | |
| 4 | 6 | |
| ... | ... | @@ -12,27 +14,16 @@ def get_form(): |
| 12 | 14 | |
| 13 | 15 | |
| 14 | 16 | def get_form_target(): |
| 15 | - return urlresolvers.reverse( | |
| 16 | - "custom_comments.views.custom_submit_comment" | |
| 17 | - ) | |
| 17 | + return urlresolvers.reverse(views.custom_submit_comment) | |
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | def get_flag_url(c): |
| 21 | - return urlresolvers.reverse( | |
| 22 | - "custom_comments.views.custom_flag_comment", | |
| 23 | - args=(c.id,) | |
| 24 | - ) | |
| 21 | + return urlresolvers.reverse(views.custom_flag_comment, args=(c.id,)) | |
| 25 | 22 | |
| 26 | 23 | |
| 27 | 24 | def get_delete_url(c): |
| 28 | - return urlresolvers.reverse( | |
| 29 | - "custom_comments.views.custom_delete_comment", | |
| 30 | - args=(c.id,) | |
| 31 | - ) | |
| 25 | + return urlresolvers.reverse(views.custom_delete_comment, args=(c.id,)) | |
| 32 | 26 | |
| 33 | 27 | |
| 34 | 28 | def get_approve_url(c): |
| 35 | - return urlresolvers.reverse( | |
| 36 | - "custom_comments.views.custom_approve_comment", | |
| 37 | - args=(c.id,) | |
| 38 | - ) | |
| 29 | + return urlresolvers.reverse(views.custom_approve_comment, args=(c.id,)) | ... | ... |
| 1 | 1 | from __future__ import absolute_import |
| 2 | 2 | |
| 3 | 3 | from django.conf.urls import patterns, url |
| 4 | +from django.contrib.contenttypes.views import shortcut | |
| 4 | 5 | |
| 5 | 6 | from django_comments.feeds import LatestCommentFeed |
| 6 | 7 | |
| ... | ... | @@ -16,7 +17,7 @@ urlpatterns = patterns('', |
| 16 | 17 | url(r'^flag/(\d+)/$', views.custom_flag_comment), |
| 17 | 18 | url(r'^delete/(\d+)/$', views.custom_delete_comment), |
| 18 | 19 | url(r'^approve/(\d+)/$', views.custom_approve_comment), |
| 19 | - url(r'^cr/(\d+)/(.+)/$', 'django.contrib.contenttypes.views.shortcut', name='comments-url-redirect'), | |
| 20 | + url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'), | |
| 20 | 21 | ) |
| 21 | 22 | |
| 22 | 23 | urlpatterns += patterns('', | ... | ... |
| 1 | 1 | from django.conf.urls import patterns, include |
| 2 | +from django.contrib.auth.views import login, logout | |
| 3 | + | |
| 2 | 4 | |
| 3 | 5 | urlpatterns = patterns('', |
| 4 | 6 | (r'^', include('django_comments.urls')), |
| 5 | 7 | |
| 6 | 8 | # Provide the auth system login and logout views |
| 7 | - (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}), | |
| 8 | - (r'^accounts/logout/$', 'django.contrib.auth.views.logout'), | |
| 9 | + (r'^accounts/login/$', login, {'template_name': 'login.html'}), | |
| 10 | + (r'^accounts/logout/$', logout), | |
| 9 | 11 | ) | ... | ... |
Please
register
or
login
to post a comment