Corrected password protected workshops (they showed the assignment!);

minor
html additional to edit assessments page.

diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php
index 7872726e111bff6cb3a5ee1e684c3f751b419e88..2741d5ade170523e31490b87b359602418860c7b 100644 (file)
--- a/mod/workshop/assessments.php
+++ b/mod/workshop/assessments.php
@@ -467,7 +467,7 @@
                // close table and form
 
                ?>
-               </table>
+               </table><br />
                <input type="submit" value="<?php  print_string("savechanges") ?>" />
                <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
                </center>

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 0dba22aa883bc2c502588499c42663b3bed1deff..d251637a6803b1a785d451924bc5941ab304629f 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -210,7 +210,6 @@
        
        /****************** student's view could be in 1 of 4 stages ***********************/
        elseif ($action == 'studentsview') {
-               workshop_print_assignment_info($workshop);
         // is a password needed?
                if ($workshop->usepassword) {
                        $correctpass = false;
@@ -247,6 +246,7 @@
                                exit();
                        }
                }
+               workshop_print_assignment_info($workshop);
                // in Stage 1? - are there any teacher's submissions? and...
                // ...has student assessed the required number of the teacher's submissions 
                if ($workshop->ntassessments and (!workshop_test_user_assessments($workshop, $USER))) {