--- loncom/interface/lonpopulate.pm 2021/12/28 02:04:35 1.90 +++ loncom/interface/lonpopulate.pm 2022/02/16 16:38:11 1.92 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.90 2021/12/28 02:04:35 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.92 2022/02/16 16:38:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1405,7 +1405,7 @@ onclick="javascript:document.photoupdate &mt("Students with an enroll type of [_1]manual[_2], will be converted automatically to the 'auto' type, when they first appear in the institutional classlist for the course - as long as nightly adds are enabled and active, or the update roster utility is used.","'","'").' '. &mt("Use the 'Lock' checkbox for any manually enrolled students for whom you wish to prevent type conversion.").' '. &mt("Use the 'Change' checkbox to switch the enroll type from auto to manual, and vice versa.").' '. - &mt("Use the 'Unlock' checkbox for any maually enrolled students for whom you no longer wish to lock the enroll type.").' '. + &mt("Use the 'Unlock' checkbox for any manually enrolled students for whom you no longer wish to lock the enroll type.").' '. &mt("Click the 'Go' button at the end of the page to process your desired changes.").'   @@ -3180,7 +3180,7 @@ sub print_update_result { &Apache::lonnet::get('environment', ['internal.coursecode','internal.sectionnums','internal.crosslistings', 'internal.authtype','internal.autharg','internal.showphoto','internal.defaultcredits', - 'internal.autodropfailsafe','internal.textbook'], + 'internal.autodropfailsafe','internal.autodropfailsafetype','internal.textbook'], $dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; @@ -3202,6 +3202,10 @@ sub print_update_result { } } } + my $failsafetype = $settings{'internal.autodropfailsafetype'}; + if ($failsafetype eq '') { + $failsafetype = $domdefaults{'failsafe'}; + } my $failsafe = $settings{'internal.autodropfailsafe'}; if ($failsafe eq '') { $failsafe = $domdefaults{'autofailsafe'}; @@ -3240,7 +3244,7 @@ sub print_update_result { ": ".$outcome); } if ($reply{$crs} > 0) { - ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,$showcredits,$defaultcredits,$failsafe,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes); + ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,$showcredits,$defaultcredits,$failsafe,$failsafetype,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow",\%phototypes); } else { $response = &mt('There was a problem retrieving institutional class list data for the course sections and crosslisted courses which contribute enrollment to this course.').' '. &mt('No updates have been carried out, and the roster remains unchanged.');