Merge pull request #438 from NobodyNada/master

Fix minor bug when viewing past reviews
Charcoal-SE · May 18, 2018 · e7c08f9 · e7c08f9
2 parents c294e2d + 68f3469
commit e7c08f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/review_queues_controller.rb b/app/controllers/review_queues_controller.rb
@@ -28,8 +28,8 @@ def submit
 
     @item = ReviewItem.find params[:item_id]
 
-    # Prevent the same item from being reviewed twice by the same user.
-    if (@item.completed && ReviewResult.exists?(item: @item)) ||
+    # Prevent the same item from being reviewed after it is completed, or twice by the same user.
+    if (@item.completed && ReviewResult.where(item: item).where.not(result: "skip").exists?) ||
        ReviewResult.where(user: current_user, item: @item).where.not(result: 'skip').exists?
 
       render json: { status: 'duplicate' }, status: 409

diff --git a/app/views/review_queues/_responses.html.erb b/app/views/review_queues/_responses.html.erb
@@ -1,6 +1,6 @@
 <div class="panel panel-default">
   <div class="panel-body">
-    <% if (item.completed and ReviewResult.exists?(item: item)) or
+    <% if (item.completed and ReviewResult.where(item: item).where.not(result: "skip").exists?) or
         ReviewResult.where(user: current_user, item: item).where.not(result: "skip").exists? %>
     <h5>
       <% if item.completed %>
@@ -29,5 +29,5 @@
       <%= link_to 'Skip', submit_review_path(name: queue.name, item_id: item.id, response: 'skip'), class: 'btn btn-primary review-submit-link',
                   method: :post, remote: true %>
     <% end %>
-  </div>
+  </di
 </div>