From cacfcd1396240ebf711c9df9be366a05e0c44c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20L=C3=B8ve=20Selvik?= Date: Wed, 17 Aug 2016 15:53:04 -0700 Subject: [PATCH] Make url patterns more consistent --- dwitter/feed/urls.py | 5 ++--- dwitter/feed/views.py | 4 ++-- dwitter/static/js/ajax-handling.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dwitter/feed/urls.py b/dwitter/feed/urls.py index fc1bea31..2da5cd38 100644 --- a/dwitter/feed/urls.py +++ b/dwitter/feed/urls.py @@ -23,12 +23,11 @@ url(r'^new/page/(?P\d+)$', views.feed, {'sort': 'new'}, name='new_feed_page'), - url(r'^dweetreply/(?P\d+)$', + url(r'^d/(?P\d+)/reply$', views.dweet_reply, name='dweet_reply'), - url(r'^d/(?P\d+)/delete$', views.dweet_delete, name='dweet_delete'), + url(r'^d/(?P\d+)/like$', views.like, name='like'), url(r'^dweet$', views.dweet, name='dweet'), - url(r'^like/(?P\d+)$', views.like, name='like'), ] diff --git a/dwitter/feed/views.py b/dwitter/feed/views.py index 4468fd52..5d4e7f28 100644 --- a/dwitter/feed/views.py +++ b/dwitter/feed/views.py @@ -101,8 +101,8 @@ def dweet_delete(request, dweet_id): @ajax_login_required -def like(request, post_id): - dweet = get_object_or_404(Dweet, id=post_id) +def like(request, dweet_id): + dweet = get_object_or_404(Dweet, id=dweet_id) if(dweet.likes.filter(id=request.user.id).exists()): liked = False diff --git a/dwitter/static/js/ajax-handling.js b/dwitter/static/js/ajax-handling.js index 58b379dd..5ce5f8eb 100644 --- a/dwitter/static/js/ajax-handling.js +++ b/dwitter/static/js/ajax-handling.js @@ -18,7 +18,7 @@ var processLike = function() { } var config = { - url: '/like/' + dweet_id, + url: '/d/' + dweet_id + '/like', dataType: 'json', success: processServerResponse, };