Reworked the anonymous reviewing functionality

examples/vanilla/settings.py

@@ -200,7 +200,6 @@ INSTALLED_APPS = (
     'oscar.apps.product',
     'oscar.apps.basket',
     'oscar.apps.payment',
-    'oscar.apps.payment.datacash',
     'oscar.apps.offer',
     'oscar.apps.address',
     'oscar.apps.partner',

oscar/apps/product/reviews/abstract_models.py

@@ -93,6 +93,12 @@ class AbstractProductReview(models.Model):
         self.total_votes += 1
         self.delta_votes += vote.delta
         self.save()
+        
+    def get_reviewer_name(self):
+        if self.user:
+            return self.user.username
+        else:
+            return self.name
 
 
 class AbstractVote(models.Model):

oscar/apps/product/reviews/forms.py

@@ -1,23 +1,23 @@
 from django.forms import BaseForm, ModelForm, CharField, EmailField
 
-from oscar.apps.product.reviews.models import ProductReview
+from oscar.core.loading import import_module
+import_module('product.reviews.models', ['ProductReview'], locals())
 
 
-class ProductReviewForm(ModelForm):
+class SignedInUserProductReviewForm(ModelForm):
     
     class Meta:
         model = ProductReview
         fields = ('title', 'score', 'body')
-
-    def __init__(self, *args, **kwargs):
-        super(ProductReviewForm, self).__init__(*args, **kwargs)
+        
+        
+class AnonymousUserProductReviewForm(ModelForm):
+    
+    name = CharField(required=True)
+    email = EmailField(required=True)
+    
+    class Meta:
+        model = ProductReview
+        fields = ('title', 'score', 'body', 'name', 'email', 'homepage')
 
 
-def make_review_form(user, values=None):
-    form = ProductReviewForm()
-    fields = form.fields
-    if not user.is_authenticated():
-        fields['name'] = CharField(max_length=100)
-        fields['email'] = EmailField()
-        fields['url'] = CharField(max_length=100, required=False)
-    return type('ProductReviewForm', (BaseForm,), {'base_fields': fields})

oscar/apps/product/reviews/views.py

@@ -9,30 +9,14 @@ from django.template.response import TemplateResponse
 from django.db.models import Avg
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib import messages
-from django.forms import ModelForm, CharField, EmailField
+from django.forms import ModelForm, CharField, EmailField, BaseForm, URLField
 
 from oscar.view.generic import PostActionMixin
 from oscar.core.loading import import_module
 import_module('product.models', ['Item', 'ItemClass'], locals())
 import_module('basket.forms', ['FormFactory'], locals())
 import_module('product.reviews.models', ['ProductReview', 'Vote'], locals())
-
-
-class ProductReviewForm(ModelForm):
-    
-    class Meta:
-        model = ProductReview
-        fields = ('title', 'score', 'body')
-
-
-def make_review_form(user, values=None):
-    form = ProductReviewForm()
-    fields = form.fields
-    if not user.is_authenticated():
-        fields['name'] = CharField(max_length=100)
-        fields['email'] = EmailField()
-        fields['url'] = CharField(max_length=100, required=False)
-    return type('ProductReviewForm', (BaseForm,), {'base_fields': fields})
+import_module('product.reviews.forms', ['SignedInUserProductReviewForm', 'AnonymousUserProductReviewForm'], locals())
 
 
 class CreateProductReviewView(CreateView):
@@ -59,7 +43,9 @@ class CreateProductReviewView(CreateView):
         return get_object_or_404(Item, pk=self.kwargs['item_id'])
     
     def get_form_class(self):
-        return ProductReviewForm
+        if not self.request.user.is_authenticated():
+            return AnonymousUserProductReviewForm
+        return SignedInUserProductReviewForm
     
     def get_form_kwargs(self):
         kwargs = super(CreateProductReviewView, self).get_form_kwargs()
@@ -68,6 +54,9 @@ class CreateProductReviewView(CreateView):
             review.user = self.request.user
         kwargs['instance'] = review
         return kwargs
+    
+    def get_success_url(self):
+        return self.object.product.get_absolute_url()
 
 
 class ProductReviewDetailView(DetailView, PostActionMixin):

oscar/apps/product/views.py

@@ -69,7 +69,6 @@ class ItemDetailView(DetailView):
         context = super(ItemDetailView, self).get_context_data(**kwargs)
         context['basket_form'] = self.get_add_to_basket_form()
         context['reviews'] = self.get_reviews()
-        context['avg_score'] = self.get_avg_review_score()
         return context
     
     def get_add_to_basket_form(self):
@@ -79,9 +78,6 @@ class ItemDetailView(DetailView):
     def get_reviews(self):
         return ProductReview.approved.filter(product=self.get_object())
     
-    def get_avg_review_score(self):
-        return ProductReview.approved.aggregate(Avg('score'))['score__avg']
-
     
 class ItemClassListView(ListView):
     u"""View products filtered by item-class."""

oscar/templates/oscar/product/detail.html

@@ -50,12 +50,16 @@
     {% for attribute in item.attributes.all %}
     <tr>
         <th>{{ attribute.type.name }}</th>
-        <th>{{ attribute.value }}</th>
+        <td>{{ attribute.value }}</td>
     </tr>
     {% endfor %}
     <tr>
-        <td><a href="{% url oscar-product-review-add item.item_class.slug item.slug item.id %}">Add a review</a></td>
-        <td><a href="{% url oscar-product-reviews item.item_class.slug item.slug item.id %}">See all reviews</a></td>
+        <th>Num reviews</th>
+        <td>{{ reviews.count }}</td>
+    </tr>
+    <tr>
+        <td></td>
+        <td></td>
     </tr>
     
 </table>
@@ -68,6 +72,43 @@
 </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 }}</h4>
+                    <h5>Reviewed by {{ review.get_reviewer_name }}</h5>
+                    <p>{{ review.date_created }}<p>
+                    <p>{{ review.body|linebreaks }}</p>
+                    {% 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 }} customers 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 %}
+
+{% endblock product_review %}
+
 {% if item.related_items.count %}
 <div class="products">
     <h4>Related items</h4>
@@ -90,38 +131,6 @@
 </div>
 {% endif %}
 
-{% block product_review %}
-
-    {% if reviews %}
-    	<h3> Product Reviews </h3>
-    	<h4> Average score: {{ avg_score|floatformat:1  }} / 5.0 </h4>
-    	{% for review in reviews|slice:":5" %}		
-    		<h4> {{ forloop.counter}}. {{ review.title }} by {{ review.user.username }} </h4>
-    		<p> Score: {{ review.score|floatformat:1 }} / 5.0</p>
-    		<p> Comments: {{ review.body|truncatewords:50 }}</p>		
-    		<p> Date created: {{ review.date_created }}</p>
-    		<a href="{{ review.get_absolute_url }}">View full review</a>			
-            {% if review.has_votes %}
-            	<h5> {{ review.num_up_votes }} out of {{ review.total_votes }} customers found this review useful.</h5>
-            {% endif %}
-            {% if user.is_authenticated %}
-        		<h4>Was this review helpful to you?</h4>
-        		<form action="{{ review.get_absolute_url }}" method="post">
-        			{% csrf_token %}               
-                    <input type="hidden" name="action" value="vote_up"/>
-                    <input type="submit" value="Yes" /> 
-                </form>
-        		<form  action="{{ review.get_absolute_url }}" method="post">
-        			{% csrf_token %}                
-                    <input type="hidden" name="action" value="vote_down"/>
-                    <input type="submit" value="No" /> 
-                </form>
-    	    {% endif %}			
-    	{% endfor %}
-    {% endif %}
-
-{% endblock product_review %}
-
 {% recently_viewed_products %}
 
 {% endblock content %}

oscar/templates/oscar/reviews/add_review.html

@@ -6,7 +6,8 @@
     <form method="post" action="{% url oscar-product-review-add item.item_class.slug item.slug item.id %}">
         {% csrf_token %}
         {{ form.as_p }}
-        <input type="submit" value="Submit" /> 
+        <input type="submit" value="Submit" /> or 
+        <a href="{{ item.get_absolute_url }}">Cancel</a>
     </form>
 
 {% endblock %}