openwebwork-cvs

[Sam H. v. a. <we...@ma...>]

Log Message:
-----------
removed view options panel, "try it" link preserves displayMode. closes 
bug #802.

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        SetMaker.pm

Revision Data
-------------
Index: SetMaker.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -u -r1.49 -r1.50
--- lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
@@ -28,6 +28,7 @@
 use warnings;
 
 use CGI::Pretty qw();
+use WeBWorK::Debug;
 use WeBWorK::Form;
 use WeBWorK::Utils qw(readDirectory max sortByName);
 use WeBWorK::Utils::Tasks qw(renderProblems);
@@ -293,10 +294,10 @@
 	push @active_modes, 'None';
 	# We have our own displayMode since its value may be None, which is illegal
 	# in other modules.
-	my $mydisplayMode = $r->param('mydisplayMode') || $r->ce->{pg}->{options}->{displayMode};
-	$result .= ' Display Mode: '.CGI::popup_menu(-name=> 'mydisplayMode',
+	my $displayMode = $r->param('displayMode') || $r->ce->{pg}->{options}->{displayMode};
+	$result .= ' Display Mode: '.CGI::popup_menu(-name=> 'displayMode',
 	                                                            -values=>\@active_modes,
-	                                                            -default=> $mydisplayMode);
+	                                                            -default=> $displayMode);
 	# Now we give a choice of the number of problems to show
 	my $defaultMax = $r->param('max_shown') || MAX_SHOW_DEFAULT;
 	$result .= ' Max. Shown:&nbsp'.
@@ -819,19 +820,23 @@
 			  problemID=>"1"),
 			params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
 		  )}, "Edit it" );
-
+	
+	my $displayMode = $self->r->param("displayMode");
+	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
+		if not defined $displayMode or $displayMode eq "None";
 	my $try_link = CGI::a({href=>$self->systemLink(
 		$urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
 			courseID =>$urlpath->arg("courseID"),
 			setID=>"Undefined_Set",
 			problemID=>"1"),
-			params =>{
-				effectiveUser => scalar($self->r->param('user')),
-				editMode => "SetMaker",
-				problemSeed=> $problem_seed,
-				sourceFilePath => "$sourceFileName"
-			}
-		)}, "Try it");
+		params =>{
+			effectiveUser => scalar($self->r->param('user')),
+			editMode => "SetMaker",
+			problemSeed=> $problem_seed,
+			sourceFilePath => "$sourceFileName",
+			displayMode => $displayMode,
+		}
+	)}, "Try it");
 
 	my %add_box_data = ( -name=>"trial$cnt",-value=>1,-label=>"Add this problem to the current set on the next update");
 	if($mark & SUCCESS) {
@@ -1205,6 +1210,11 @@
 	return "Library Browser";
 }
 
+# hide view options panel since it distracts from SetMaker's built-in view options
+sub options {
+	return "";
+}
+
 sub body {
 	my ($self) = @_;
 
@@ -1242,7 +1252,7 @@
 		renderProblems(r=> $r,
 									 user => $user,
 									 problem_list => [@pg_files[$first_shown..$last_shown]],
-									 displayMode => $r->param('mydisplayMode')) : ();
+									 displayMode => $r->param('displayMode')) : ();
 
 	##########	Top part
 	print CGI::startform({-method=>"POST", -action=>$r->uri, -name=>'mainform'}),