Merge pull request #532 from SAASVUUV/main

#479: fixed the enrollment_hold problem
gems-uff · Feb 6, 2025 · 0247e5b · 0247e5b
2 parents 9fc2bda + eea9b8e
commit 0247e5b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/models/enrollment_hold.rb b/app/models/enrollment_hold.rb
@@ -41,8 +41,10 @@ def validate_dates
       errors.add(:base, :before_admission_date)
     end
     dismissal = enrollment.dismissal
-    if dismissal.present? && self.end_date > dismissal.date
-      errors.add(:base, :after_dismissal_date)
+    if dismissal.present? && dismissal.dismissal_reason.thesis_judgement == DismissalReason::APPROVED
+      if self.end_date > dismissal.date
+        errors.add(:base, :after_dismissal_date)
+      end
     end
   end