Check that handout/writeup exists before checking path (#2001)

Move present? check to front
autolab · Nov 4, 2023 · 21cb413 · 21cb413
1 parent 5ce46a0
commit 21cb413
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/assessment.rb b/app/models/assessment.rb
@@ -283,7 +283,7 @@ def writeup_is_url?
 
   def writeup_is_file?
     # Ensure that writeup lies within the assessment folder
-    Archive.in_dir?(writeup_path, folder_path) && is_file?(writeup)
+    writeup.present? && Archive.in_dir?(writeup_path, folder_path) && is_file?(writeup)
   end
 
   def handout_is_url?
@@ -292,7 +292,7 @@ def handout_is_url?
 
   def handout_is_file?
     # Ensure that handout lies within the assessment folder
-    Archive.in_dir?(handout_path, folder_path) && is_file?(handout)
+    handout.present? && Archive.in_dir?(handout_path, folder_path) && is_file?(handout)
   end
 
   # raw_score
@@ -543,7 +543,7 @@ def max_score!
   end
 
   def is_file?(name)
-    name.present? && File.file?(path(name))
+    File.file?(path(name))
   end
 
   def verify_dates_order