--- loncom/interface/lonconfigsettings.pm 2022/02/07 12:00:27 1.21.4.13.2.2 +++ loncom/interface/lonconfigsettings.pm 2024/07/03 16:35:11 1.21.4.14 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.21.4.13.2.2 2022/02/07 12:00:27 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.21.4.14 2024/07/03 16:35:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,7 +39,7 @@ use Apache::courseclassifier(); use LONCAPA qw(:DEFAULT :match); sub print_header { - my ($r,$phase,$context,$jscript,$container,$instcode,$dom,$values) = @_; + my ($r,$phase,$context,$jscript,$container,$instcode,$dom) = @_; my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check, $crstype,@actions,@code_order); if ($phase eq 'display') { @@ -214,17 +214,6 @@ $jscript my $optionsprefix = 'LC_options_helpdesk_'; $onload .= "toggleHelpdeskRow(document.display,'overrides','$customclass','$optionsprefix');"; } - if (grep(/^ltitools$/,@actions)) { - $onload .= "toggleLTITools(document.display,'user','add');"; - if (ref($values) eq 'HASH') { - if (ref($values->{'ltitools'}) eq 'HASH') { - my $numltitools = scalar(keys(%{$values->{'ltitools'}})); - for (my $i=0; $i<$numltitools; $i++) { - $onload .= "toggleLTITools(document.display,'user','$i');"; - } - } - } - } if (grep(/^wafproxy$/,@actions)) { $onload .= "toggleWAF();checkWAF();updateWAF();"; } @@ -256,34 +245,8 @@ $jscript $onload = "courseSet('','load');toggleCloners(document.display.cloners_instcode);"; } } - if (grep(/^linkprotection$/,@actions)) { - if (ref($values) eq 'HASH') { - if (ref($values->{'linkprotection'}) eq 'HASH') { - my $ltiauth; - if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) { - $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'}; - } else { - my %domdefs = &Apache::lonnet::get_domain_defaults($dom); - $ltiauth = $domdefs{'crsltiauth'}; - } - my $posslti = scalar(keys(%{$values->{'linkprotection'}})); - for (my $i=0; $i<=$posslti; $i++) { - my $num = $i; - if ($i == $posslti) { - $num = 'add'; - } - if (ref($values->{'linkprotection'}->{$i}) eq 'HASH') { - if ($values->{'linkprotection'}->{$i}->{'usable'}) { - $onload .= "toggleLTI(document.display,'$num','secret');"; - } - } - if ($ltiauth) { - $onload .= "toggleLTIReqUser(document.display,'requser','optional','1','block','$num');". - "toggleLTIReqUser(document.display,'mapuser','userfield','other','inline-block','$num');"; - } - } - } - } + if (grep(/^grading$/,@actions)) { + $onload .= 'toggleGrading(document.display);toggleHiddenTotalsSec(document.display);'; } if ($onload) { my %loaditems = ( @@ -378,7 +341,7 @@ sub make_changes { } else { $changes{$item} = {}; $errors = - &Apache::courseprefs::process_changes($dom,$confname,$item,$values, + &Apache::courseprefs::process_changes($dom,$item,$values, $prefs->{$item},$changes{$item}, $allitems,\%disallowed,$crstype); if (keys(%{$changes{$item}}) > 0) { @@ -438,7 +401,7 @@ sub display_settings { if (ref($values) eq 'HASH') { $instcode = $values->{'internal.coursecode'}; } - &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom,$values); + &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom); my $divwidth = 900; if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { if (@actions > 0) { @@ -488,7 +451,7 @@ sub display_settings { $phase,$item,$prefs->{$item},$settings); } else { ($output{$item},$rowtotal{$item}) = - &Apache::courseprefs::print_config_box($r,$dom,$confname,$phase, + &Apache::courseprefs::print_config_box($r,$dom,$phase, $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission); } $rowsum += $rowtotal{$item};