Addition of returnto parameter to workshop_print_assessment function to

allow return to original pages when making assessemnts; clearing
(trival) unassigned variable bug in the same function.

diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 8fc0d5dce0ee256cf95436e266d73dad88b56cc8..27a4935655929e13193b999327c2b434747e0c11 100644 (file)
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -223,6 +223,7 @@
                        $assessment->grade = -1; // set impossible grade
                        $assessment->timecreated = $yearfromnow;
                        $assessment->timegraded = 0;
+                       $assessment->timeagreed = 0;
                        if (!$assessment->id = insert_record("workshop_assessments", $assessment)) {
                                error("Could not insert workshop assessment!");
                                }
@@ -231,7 +232,7 @@
                print_heading_with_help(get_string("assessthissubmission", "workshop"), "grading", "workshop");
                
                // show assessment and allow changes
-               workshop_print_assessment($workshop, $assessment, true, $allowcomments);
+               workshop_print_assessment($workshop, $assessment, true, $allowcomments, $_SERVER["HTTP_REFERER"]);
                }\r
 
 
@@ -875,14 +876,19 @@
                        }
                        
            add_to_log($course->id, "workshop", "assess", "view.php?a=$workshop->id", "$workshop->id");
-
+               
+               // set up return address
+               if (!$returnto = $form->returnto) {
+                       $returnto = "view.php?id=$cm->id";
+                       }
+                       
                // show grade if grading strategy is not zero
                if ($workshop->gradingstrategy) {
-                       redirect("view.php?id=$cm->id", get_string("thegradeis", "workshop").": ".number_format($grade, 2)."% (".get_string("maximumgrade").
+                       redirect($returnto, get_string("thegradeis", "workshop").": ".number_format($grade, 2)."% (".get_string("maximumgrade").
                                " ".number_format($workshop->grade)."%)");
                        }
                else {
-                       redirect("view.php?id=$cm->id");
+                       redirect($returnto);
                        }
                }
 

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 9268a9de75fcdab28fcc9a2d350cc6b52c3c65e9..8a62ac71ed9362a0fa7b2118ef7757d36620a144 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -707,7 +707,7 @@ function workshop_list_ungraded_assessments($workshop, $stype) {
 function workshop_list_user_submissions($workshop, $user) {
 
 
-function workshop_print_assessment($workshop, $assessment, $allowchanges, $showcommentlinks)
+function workshop_print_assessment($workshop, $assessment, $allowchanges, $showcommentlinks, $returnto)
 function workshop_print_assessments_by_user_for_admin($workshop, $user) {
 function workshop_print_assessments_for_admin($workshop, $submission) {
 function workshop_print_assignment_info($cm, $workshop) {
@@ -2030,8 +2030,9 @@ function workshop_list_user_submissions($workshop, $user) {
 
 
 function workshop_print_assessment($workshop, $assessment = false, $allowchanges = false, 
-       $showcommentlinks = false) {
+       $showcommentlinks = false, $returnto = '') {
        // $allowchanges added 14/7/03
+       // $returnto added 28/8/03
        global $CFG, $THEME, $USER, $WORKSHOP_SCALES, $WORKSHOP_EWEIGHTS;
        if (! $course = get_record("course", "id", $workshop->course)) {
                error("Course is misconfigured");
@@ -2131,6 +2132,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
        <INPUT TYPE="hidden" NAME="id" VALUE="<?PHP echo $cm->id ?>">
        <input type="hidden" name="aid" value="<?PHP echo $assessment->id ?>">
        <input type="hidden" name="action" value="updateassessment">
+       <input type="hidden" name="returnto" value="<?PHP echo $returnto ?>">
        <CENTER>
        <TABLE CELLPADDING=2 BORDER=1>
        <?PHP