Merge lp:~aaronp/software-center/fix-794060-for-4.0 into lp:software-center/4.0

[Aaron Peachey]

additional fix for bug LP #794060
original fix stopped duplicates upon usefulness and flagging but still resulted in duplicates after submitting a new review

this fix now prevents duplicates upon submitting a review too

[Gary Lasker (gary-lasker)]

This looks great and does the trick just fine in testing. Thanks very much for taking care of this, Aaron!

review: Approve

=== modified file 'softwarecenter/view/appdetailsview_gtk.py'
--- softwarecenter/view/appdetailsview_gtk.py	2011-06-10 13:31:11 +0000
+++ softwarecenter/view/appdetailsview_gtk.py	2011-06-19 05:23:23 +0000
@@ -831,8 +831,11 @@
         if action:
             self._review_update_single(action, single_review)
         else:
+            curr_list = self.reviews.get_all_review_ids()
             for review in reviews_data:
-                self.reviews.add_review(review)
+                if not review.id in curr_list:
+                    self.reviews.add_review(review)
+        
         self.reviews.configure_reviews_ui()
 
     def on_test_drive_clicked(self, button):

=== modified file 'softwarecenter/view/widgets/reviews.py'
--- softwarecenter/view/widgets/reviews.py	2011-06-10 13:31:11 +0000
+++ softwarecenter/view/widgets/reviews.py	2011-06-19 05:23:23 +0000
@@ -856,9 +856,12 @@
             else:
                 self.vbox.pack_start(NoReviewYet())
 
-        # only show the "More" button if there is a chance that there
-        # are more
-        if self.reviews and len(self.reviews) % REVIEWS_BATCH_PAGE_SIZE == 0:
+        # aaronp: removed check to see if the length of reviews is divisible by
+        # the batch size to allow proper fixing of LP: #794060 as when a review
+        # is submitted and appears in the list, the pagination will break this
+        # check and make it unreliable
+        #if self.reviews and len(self.reviews) % REVIEWS_BATCH_PAGE_SIZE == 0:
+        if self.reviews:
             # mvo: the lines below are only needed because "More…" is
             #      actually translated already
             # button = gtk.Button(_("Show more reviews"))
@@ -897,6 +900,12 @@
                 self.reviews.remove(r)
                 break
         return
+    
+    def get_all_review_ids(self):
+        ids = []
+        for review in self.reviews:
+            ids.append(review.id)
+        return ids 
 
     def clear(self):
         self.reviews = []