[extensions-web: 55/75] Allow more than one review on a version.



commit 54d44e9aa884fc84d0a0019a97fb3839c37c80a6
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Sep 22 01:17:54 2011 -0400

    Allow more than one review on a version.
    
    With this change, we start remodeling the role of a review to be more like a
    commen on a piece of code, designed to facilitate conversation, like Splinter
    and Review Board do, rather than a canonical once-given approve/reject.
    
    One of these days I should probably just embed Review Board inside SweetTooth.
    It's a Django app...

 sweettooth/review/templates/review/review.html |    2 +-
 sweettooth/review/views.py                     |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/sweettooth/review/templates/review/review.html b/sweettooth/review/templates/review/review.html
index caba36f..4754313 100644
--- a/sweettooth/review/templates/review/review.html
+++ b/sweettooth/review/templates/review/review.html
@@ -38,7 +38,7 @@
 
 <h2 class="expanded"> Previous Reviews </h2>
 <div id="previous">
-  {% include "review/review_table.html" with reviews=previous_reviews empty="There were no previous reviews of this extension." %}
+  {% include "review/review_table.html" with reviews=previous_versions empty="There were no previous reviews of this extension." %}
 </div>
 
 <h2 class="expanded"> Review </h2>
diff --git a/sweettooth/review/views.py b/sweettooth/review/views.py
index 19b6558..7d2582d 100644
--- a/sweettooth/review/views.py
+++ b/sweettooth/review/views.py
@@ -108,15 +108,18 @@ class ReviewVersionView(DetailView):
         if not request.user.has_perm("review.can-review-extensions"):
             return HttpResponseForbidden()
 
-        if self.object.status != models.STATUS_LOCKED:
-            return HttpResponseForbidden()
-
         return super(ReviewVersionView, self).get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super(ReviewVersionView, self).get_context_data(**kwargs)
-        previous_reviews = CodeReview.objects.filter(version__extension=self.object.extension)
-        context['previous_reviews'] = previous_reviews
+        # Reviews on previous versions of the same extension.
+        previous_versions = CodeReview.objects.filter(version__extension=self.object.extension)
+
+        # Other reviews on the same version
+        previous_reviews = self.object.reviews
+
+        context.extend(dict(previous_versions=previous_versions,
+                            previous_reviews=previous_reviews))
         return context
 
 class ReviewListView(ListView):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]