[WWcvs] webwork-modperl: Added safety toggle for unassignment on this page (like

[jj v. a. <we...@ma...>]

Log Message:
-----------
Added safety toggle for unassignment on this page (like other places where
sets can be unassigned).

Modified Files:
--------------
    webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor:
        Assigner.pm

Revision Data
-------------
Index: Assigner.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -Llib/WeBWorK/ContentGenerator/Instructor/Assigner.pm -Llib/WeBWorK/ContentGenerator/Instructor/Assigner.pm -u -r1.31 -r1.32
--- lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
@@ -97,21 +97,24 @@
 	if (defined $r->param("assign") || defined $r->param("unassign")) {
 		if  (@selected_users && @selected_sets) {
 			my @results;  # This is not used?
-			$self->assignSetsToUsers(\@selected_sets, \@selected_users) if defined $r->param("assign");
-			$self->unassignSetsFromUsers(\@selected_sets, \@selected_users) if defined $r->param("unassign");
+			if(defined $r->param("assign")) {
+				$self->assignSetsToUsers(\@selected_sets, \@selected_users);
+				print CGI::div({class=>"ResultsWithoutError"},CGI::p('All assignments were made successfully.'));
+			}
+			if (defined $r->param("unassign")) {
+				if(defined $r->param('unassignFromAllSafety') and $r->param('unassignFromAllSafety')==1) {
+					$self->unassignSetsFromUsers(\@selected_sets, \@selected_users) if(defined $r->param("unassign"));
+					print CGI::div({class=>"ResultsWithoutError"},CGI::p('All unassignments were made successfully.'));
+				} else { # asked for unassign, but no safety radio toggle
+					print CGI::div({class=>"ResultsWithError"},CGI::p('Unassignments were not done.  You need to both click to "Allow unassign" and click on the Unassign button.'));
+				}
+			}
 			
 			if (@results) { # Can't get here?
 				print CGI::div({class=>"ResultsWithError"},
 					CGI::p("The following error(s) occured while assigning:"),
 					CGI::ul(CGI::li(\@results)),
 				);
-			} else {
-				my $happymessage= 'All assignments were made successfully.';
-				$happymessage='All unassignments were made successfully.'
-					if defined $r->param("unassign");
-				print CGI::div({class=>"ResultsWithoutError"},
-					CGI::p($happymessage),
-				);
 			}
 		} else {
 			print CGI::div({class=>"ResultsWithError"},
@@ -174,6 +177,7 @@
 						-value => "Unassign selected sets from selected users",
 						-style => "width: 45ex",
 					),
+					CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Assignments only', 1=>'Allow unassign'}),
 				),
 			),
 		),