From: rkingdon <rkingdon>
Date: Sat, 2 Oct 2004 16:04:56 +0000 (+0000)
Subject: Corrected password protected workshops (they showed the assignment!);
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ac220a6d801ce7a4011926ea7d9a821a833c1b41;p=moodle.git

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 7872726e11..2741d5ade1 100644
--- 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 0dba22aa88..d251637a68 100644
--- 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))) {