Fix bug when deleting a submission. Very recent assessments were not

deleted. Now all assessments of the deleted submission are deleted
including the "hot" ones.

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 8a62ac71ed9362a0fa7b2118ef7757d36620a144..f4857fe2b6ab40aa1ef346c3b446699b7c35fe47 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1016,13 +1016,19 @@ function workshop_file_area_name($workshop, $submission) {
 }
 
 
-function workshop_get_assessments($submission) {
-       // Return all assessments for this submission provided they are after the editing time, ordered oldest first, newest last
+function workshop_get_assessments($submission, $all = '') {
+       // Return assessments for this submission ordered oldest first, newest last
+       // new assessments made withinthe editing time are NOT return unless the
+       // second argument is set to ALL
        global $CFG;
 
-       $timenow = time();
-    return get_records_select("workshop_assessments", "(submissionid = $submission->id) AND 
-               (timecreated < $timenow - $CFG->maxeditingtime)", "timecreated DESC");
+       if ($all != 'ALL') {
+               $timenow = time();
+               return get_records_select("workshop_assessments", "(submissionid = $submission->id) AND 
+                       (timecreated < $timenow - $CFG->maxeditingtime)", "timecreated DESC");
+       } else {
+               return get_records_select("workshop_assessments", "submissionid = $submission->id", "timecreated DESC");
+       }
 }
 
 

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index bcd0fbb4d8c78a637664b131a52169072a780ea7..0c003466660c6c7834ef47dd86c3c530c3be9e63 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -136,7 +136,7 @@
                        }
                print_string("deleting", "workshop");
                // first get any assessments...
-               if ($assessments = workshop_get_assessments($submission)) {
+               if ($assessments = workshop_get_assessments($submission, 'ALL')) {
                        foreach($assessments as $assessment) {
                                // ...and all the associated records...
                                delete_records("workshop_comments", "assessmentid", $assessment->id);
@@ -893,7 +893,7 @@
                        }
                print_string("deleting", "workshop");
                // first get any assessments...
-               if ($assessments = workshop_get_assessments($submission)) {
+               if ($assessments = workshop_get_assessments($submission, 'ALL')) {
                        foreach($assessments as $assessment) {
                                // ...and all the associated records...
                                delete_records("workshop_comments", "assessmentid", $assessment->id);