Merge pull request #6467 from pretendWhale/v2.2.3

V2.2.3

Changelog.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## [v2.2.3]
+- Fix bug where in some circumstances the wrong result would be displayed to students (#6465)
 
 ## [v2.2.2]
 - Apply course maximum file size to feedback files (#6430)

app/MARKUS_VERSION

@@ -1 +1 @@
-VERSION=v2.2.2,PATCH_LEVEL=DEV
+VERSION=v2.2.3,PATCH_LEVEL=DEV

app/models/submission.rb

@@ -104,7 +104,7 @@ def get_latest_result
   # then return the original result instead since that one should be visible while the remark
   # request is being processed
   def get_visible_result
-    non_pr_results.order(id: :desc).where(released_to_students: true).first || get_original_result
+    non_pr_results.reorder(id: :desc).where(released_to_students: true).first || get_original_result
   end
 
   # Sets marks when automated tests are run

spec/models/submission_spec.rb

@@ -147,5 +147,14 @@
         expect(submission.get_visible_result).to eq submission.get_original_result
       end
     end
+    context 'when there are multiple results released to students' do
+      before do
+        released_result
+        released_remark_result
+      end
+      it 'should return the remark' do
+        expect(submission.get_visible_result).to eq released_remark_result
+      end
+    end
   end
 end