Merge pull request #59 from lionleaf/url-changes

Make url patterns more consistent

dwitter/feed/urls.py

@@ -23,12 +23,11 @@
     url(r'^new/page/(?P<page_nr>\d+)$',
         views.feed, {'sort': 'new'}, name='new_feed_page'),
 
-    url(r'^dweetreply/(?P<dweet_id>\d+)$',
+    url(r'^d/(?P<dweet_id>\d+)/reply$',
         views.dweet_reply, name='dweet_reply'),
-
     url(r'^d/(?P<dweet_id>\d+)/delete$',
         views.dweet_delete, name='dweet_delete'),
+    url(r'^d/(?P<dweet_id>\d+)/like$', views.like, name='like'),
 
     url(r'^dweet$', views.dweet, name='dweet'),
-    url(r'^like/(?P<post_id>\d+)$', views.like, name='like'),
 ]

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

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,
    };