From af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 21 Feb 2012 20:12:14 +0000
Subject: Merging master into develop

---
 examples/blogpost/resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples/blogpost/resources.py')

diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
index 5a3c1ce2..d4e0594d 100644
--- a/examples/blogpost/resources.py
+++ b/examples/blogpost/resources.py
@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
 from djangorestframework.resources import ModelResource
+from djangorestframework.utils import reverse
 from blogpost.models import BlogPost, Comment
 
 
@@ -12,7 +12,7 @@ class BlogPostResource(ModelResource):
     ordering = ('-created',)
 
     def comments(self, instance):
-        return reverse('comments', kwargs={'blogpost': instance.key})
+        return reverse('comments', request, kwargs={'blogpost': instance.key})
 
 
 class CommentResource(ModelResource):
@@ -24,4 +24,4 @@ class CommentResource(ModelResource):
     ordering = ('-created',)
 
     def blogpost(self, instance):
-        return reverse('blog-post', kwargs={'key': instance.blogpost.key})
+        return reverse('blog-post', request, kwargs={'key': instance.blogpost.key})
-- 
cgit v1.2.3


From 5fd4c639d7c64572dd07dc31dcd627bed9469b05 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 21 Feb 2012 20:57:36 +0000
Subject: Merge master into develop

---
 examples/blogpost/resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/blogpost/resources.py')

diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
index d4e0594d..d11c5615 100644
--- a/examples/blogpost/resources.py
+++ b/examples/blogpost/resources.py
@@ -1,5 +1,5 @@
 from djangorestframework.resources import ModelResource
-from djangorestframework.utils import reverse
+from djangorestframework.reverse import reverse
 from blogpost.models import BlogPost, Comment
 
 
-- 
cgit v1.2.3


From 1cde31c86d9423e9b7a7409c2ef2ba7c0500e47f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 25 Feb 2012 18:45:17 +0000
Subject: Massive merge

---
 examples/blogpost/resources.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'examples/blogpost/resources.py')

diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
index d11c5615..b3659cdf 100644
--- a/examples/blogpost/resources.py
+++ b/examples/blogpost/resources.py
@@ -11,8 +11,15 @@ class BlogPostResource(ModelResource):
     fields = ('created', 'title', 'slug', 'content', 'url', 'comments')
     ordering = ('-created',)
 
+    def url(self, instance):
+        return reverse('blog-post',
+                        kwargs={'key': instance.key},
+                        request=self.request)
+
     def comments(self, instance):
-        return reverse('comments', request, kwargs={'blogpost': instance.key})
+        return reverse('comments',
+                        kwargs={'blogpost': instance.key},
+                        request=self.request)
 
 
 class CommentResource(ModelResource):
@@ -24,4 +31,6 @@ class CommentResource(ModelResource):
     ordering = ('-created',)
 
     def blogpost(self, instance):
-        return reverse('blog-post', request, kwargs={'key': instance.blogpost.key})
+        return reverse('blog-post',
+                       kwargs={'key': instance.blogpost.key},
+                       request=self.request)
-- 
cgit v1.2.3


From eea2aa04378d27d79e7aba12ce95c697148bd57e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 29 Aug 2012 19:54:38 +0100
Subject: Remove examples (to be moved to a seperate project)

---
 examples/blogpost/resources.py | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 examples/blogpost/resources.py

(limited to 'examples/blogpost/resources.py')

diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
deleted file mode 100644
index b3659cdf..00000000
--- a/examples/blogpost/resources.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from djangorestframework.resources import ModelResource
-from djangorestframework.reverse import reverse
-from blogpost.models import BlogPost, Comment
-
-
-class BlogPostResource(ModelResource):
-    """
-    A Blog Post has a *title* and *content*, and can be associated with zero or more comments.
-    """
-    model = BlogPost
-    fields = ('created', 'title', 'slug', 'content', 'url', 'comments')
-    ordering = ('-created',)
-
-    def url(self, instance):
-        return reverse('blog-post',
-                        kwargs={'key': instance.key},
-                        request=self.request)
-
-    def comments(self, instance):
-        return reverse('comments',
-                        kwargs={'blogpost': instance.key},
-                        request=self.request)
-
-
-class CommentResource(ModelResource):
-    """
-    A Comment is associated with a given Blog Post and has a *username* and *comment*, and optionally a *rating*.
-    """
-    model = Comment
-    fields = ('username', 'comment', 'created', 'rating', 'url', 'blogpost')
-    ordering = ('-created',)
-
-    def blogpost(self, instance):
-        return reverse('blog-post',
-                       kwargs={'key': instance.blogpost.key},
-                       request=self.request)
-- 
cgit v1.2.3