Autolab Release v2.0.8

autolab · May 4, 2017 · e21a418 · e21a418
2 parents 2159d9b + 79678fe
commit e21a418
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/app/controllers/assessments_controller.rb b/app/controllers/assessments_controller.rb
@@ -535,9 +535,16 @@ def update
       @assessment.save!
     end
 
-    flash[:success] = "Saved!" if @assessment.update!(edit_assessment_params)
 
-    redirect_to(tab_index) && return
+    begin
+      flash[:success] = "Saved!" if @assessment.update!(edit_assessment_params)
+
+      redirect_to(tab_index) && return
+    rescue ActiveRecord::RecordInvalid => invalid
+      flash[:error] = invalid.message.sub! "Validation failed: ", ""
+
+      redirect_to(tab_index) && return
+    end
   end
 
   action_auth_level :releaseAllGrades, :instructor

diff --git a/app/models/assessment.rb b/app/models/assessment.rb
@@ -435,8 +435,9 @@ def is_file?(name)
   end
 
   def verify_dates_order
-    errors.add :start_at, "must be before time assessment is due at" if start_at > due_at
-    errors.add :due_at, "must be before time assessment ends at" if due_at > end_at
+    errors.add :due_at, "must be after the start date" if start_at > due_at
+    errors.add :end_at, "must be after the due date" if due_at > end_at
+    errors.add :grading_deadline, "must be after the end date" if end_at > grading_deadline
   end
 
   def handin_directory_and_filename_or_disable_handins