made product reviews work with my URLs

examples/vanilla/settings.py

@@ -191,6 +191,7 @@ INSTALLED_APPS = (
     'oscar.apps.shipping',
     'oscar.apps.order_management',
     'oscar.apps.product',
+    'oscar.apps.product.reviews',
     'oscar.apps.basket',
     'oscar.apps.payment',
     'oscar.apps.payment.datacash',

oscar/apps/product/__init__.py

@@ -14,6 +14,7 @@ class ProductApplication(Application):
             url(r'^$', self.list_view.as_view(), name='list'),
             url(r'^(?P<item_class_slug>[\w-]+)/$', self.class_list_view.as_view(), name='class-list'),            
             url(r'^(?P<item_class_slug>[\w-]+)/(?P<item_slug>[\w-]*)-(?P<pk>\d+)/$', self.detail_view.as_view(), name='detail'),
+            url(r'^(?P<item_class_slug>[\w-]+)/(?P<item_slug>[\w-]*)-(?P<item_id>\d+)/review/', include('oscar.apps.product.reviews.urls')),         
         )
         return urlpatterns
 

oscar/apps/product/reviews/abstract_models.py

@@ -24,7 +24,7 @@ class AbstractProductReview(models.Model):
     """
     
     # Note we keep the review even if the product is deleted
-    product = models.ForeignKey('product.Item', related_name='product', null=True, on_delete=models.SET_NULL)
+    product = models.ForeignKey('product.Item', related_name='reviews', null=True, on_delete=models.SET_NULL)
     
     SCORE_CHOICES = tuple([(x, x) for x in range(0, 6)])
     score = models.SmallIntegerField(_("Score"), choices=SCORE_CHOICES)
@@ -63,7 +63,7 @@ class AbstractProductReview(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('oscar-product-review', (), {
+        return ('products:review-detail', (), {
             'item_class_slug': self.product.get_item_class().slug,
             'item_slug': self.product.slug,
             'item_id': self.product.id,

oscar/apps/product/reviews/urls.py

@@ -6,7 +6,7 @@ import_module('product.reviews.views', ['CreateProductReviewView', 'ProductRevie
                                         'ProductReviewListView'], locals())  
 
 urlpatterns = patterns('oscar.product.reviews.views',
-    url(r'(?P<pk>\d+)/$', ProductReviewDetailView.as_view(), name='oscar-product-review'),
-    url(r'add/$', CreateProductReviewView.as_view(), name='oscar-product-review-add'),
-    url(r'all/$', ProductReviewListView.as_view(), name='oscar-product-reviews'),
+    url(r'^(?P<pk>\d+)/$', ProductReviewDetailView.as_view(), name='review-detail'),
+    url(r'^add/$', CreateProductReviewView.as_view(), name='review-add'),
+    url(r'^$', ProductReviewListView.as_view(), name='review-list'),
 )

oscar/templates/oscar/product/detail.html

@@ -64,50 +64,53 @@
 
 {% if item.stockrecord %}
 
-{% basket_form item as form %}
+{% basket_form item as basket_form %}
 
 <form action="{% url oscar-basket %}" method="post">
     {% csrf_token %}
-    {{ form.as_p }}
+    {{ basket_form.as_p }}
     <input type="submit" value="Add to basket" />
 </form>
 {% endif %}
 
 {% block product_review %}
 
-    {% if reviews %}
-    	<h3>Reviews of {{ item.title }}</h3>
-        <p>Read customer reviews on this product. If you have read this book, why not post your own
-           review?</p>
-        <p><a href="{% url oscar-product-review-add item.item_class.slug item.slug item.id %}">Add a review</a></p>
-        <div>
-            {% for review in reviews|slice:":3" %}
-                <div class="review">
-                    <h4>{{ review.title }} ({{ review.score }}/5)</h4>
-                    <h5>Reviewed by {{ review.get_reviewer_name }}</h5>
-                    <p>{{ review.date_created }}<p>
-                    <p>{{ review.body|linebreaks }}</p>
-                    <p><a href="{{ review.get_absolute_url }}">Permalink</a>
-                    {% if user.is_authenticated %}
-                        <form action="{{ review.get_absolute_url }}" method="post">
-                            {% csrf_token %}               
-                            <input type="hidden" name="action" value="vote_up"/>
-                            <input type="submit" value="I agree" /> 
-                        </form>
-                        <form  action="{{ review.get_absolute_url }}" method="post">
-                            {% csrf_token %}                
-                            <input type="hidden" name="action" value="vote_down"/>
-                            <input type="submit" value="I disagree" /> 
-                        </form>
-                    {% endif %}
-                    {% if review.has_votes %}
-                        <p>{{ review.num_up_votes }} customer{{ review.num_up_votes|pluralize }} agreed.</p>
-                    {% endif %}
-                </div>
-            {% endfor %}
-            <p><a href="{% url oscar-product-reviews item.item_class.slug item.slug item.id %}">See all reviews</a>.</p>
-        </div>
-    {% endif %}
+<h3>Reviews of {{ item.title }}</h3>
+<p>Read customer reviews on this product. If you have read this book, why not post your own
+   review?</p>
+<p><a href="{% url products:review-add item.item_class.slug item.slug item.id %}">Add a review</a></p>
+
+{% with item.reviews.all as reviews %}
+{% if reviews %}
+    <div>
+        {% for review in reviews|slice:":3" %}
+            <div class="review">
+                <h4>{{ review.title }} ({{ review.score }}/5)</h4>
+                <h5>Reviewed by {{ review.get_reviewer_name }}</h5>
+                <p>{{ review.date_created }}<p>
+                <p>{{ review.body|linebreaks }}</p>
+                <p><a href="{{ review.get_absolute_url }}">Permalink</a>
+                {% if user.is_authenticated %}
+                    <form action="{{ review.get_absolute_url }}" method="post">
+                        {% csrf_token %}               
+                        <input type="hidden" name="action" value="vote_up"/>
+                        <input type="submit" value="I agree" /> 
+                    </form>
+                    <form  action="{{ review.get_absolute_url }}" method="post">
+                        {% csrf_token %}                
+                        <input type="hidden" name="action" value="vote_down"/>
+                        <input type="submit" value="I disagree" /> 
+                    </form>
+                {% endif %}
+                {% if review.has_votes %}
+                    <p>{{ review.num_up_votes }} customer{{ review.num_up_votes|pluralize }} agreed.</p>
+                {% endif %}
+            </div>
+        {% endfor %}
+        <p><a href="{% url products:review-list item.item_class.slug item.slug item.id %}">See all reviews</a>.</p>
+    </div>
+{% endif %}
+{% endwith %}
 
 {% endblock product_review %}
 

oscar/templates/oscar/reviews/add_review.html

@@ -3,7 +3,7 @@
 {% block product_review %}
 
     <h4>Leave a product review</h4>
-    <form method="post" action="{% url oscar-product-review-add item.item_class.slug item.slug item.id %}">
+    <form method="post" action=".">
         {% csrf_token %}
         {{ form.as_p }}
         <input type="submit" value="Submit" /> or