Diff for /loncom/interface/lonmodifycourse.pm between versions 1.77 and 1.79.2.1

version 1.77, 2015/05/22 21:08:42 version 1.79.2.1, 2016/08/07 01:32:52
Line 55  sub get_dc_settable { Line 55  sub get_dc_settable {
 sub autoenroll_keys {  sub autoenroll_keys {
     my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',      my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
                      'autoadds','autodrops','autostart','autoend','sectionnums',                       'autoadds','autodrops','autostart','autoend','sectionnums',
                      'crosslistings','co-owners'];                       'crosslistings','co-owners','autodropfailsafe'];
     my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];      my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
     return ($internals,$accessdates);      return ($internals,$accessdates);
 }  }
Line 117  sub get_enrollment_settings { Line 117  sub get_enrollment_settings {
                 $enrollvar{$type} =~ s/,/, /g;                  $enrollvar{$type} =~ s/,/, /g;
             } elsif ($type eq "authtype"              } elsif ($type eq "authtype"
                      || $type eq "autharg"    || $type eq "coursecode"                       || $type eq "autharg"    || $type eq "coursecode"
                      || $type eq "crosslistings") {                       || $type eq "crosslistings" || $type eq "selfenrollmgr"
   +                    || $type eq "autodropfailsafe") {
                 $enrollvar{$type} = $settings{$item};                  $enrollvar{$type} = $settings{$item};
             } elsif ($type eq 'defaultcredits') {              } elsif ($type eq 'defaultcredits') {
                 if (&showcredits($cdom)) {                  if (&showcredits($cdom)) {
                     $enrollvar{$type} = $settings{$item};                      $enrollvar{$type} = $settings{$item};
                 }                  }
             } elsif ($type eq 'selfenrollmgr') {  
                 $enrollvar{$type} = $settings{$item};      
             } elsif ($type eq 'courseowner') {              } elsif ($type eq 'courseowner') {
                 if ($settings{$item} =~ /^[^:]+:[^:]+$/) {                  if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
                     $enrollvar{$type} = $settings{$item};                      $enrollvar{$type} = $settings{$item};
Line 1901  function hide_searching() { Line 1900  function hide_searching() {
     } elsif ($phase eq 'setquota') {      } elsif ($phase eq 'setquota') {
         my $invalid = &mt('The quota you entered contained invalid characters.');          my $invalid = &mt('The quota you entered contained invalid characters.');
         my $alert = &mt('You must enter a number');          my $alert = &mt('You must enter a number');
           &js_escape(\$invalid);
           &js_escape(\$alert);
         my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';          my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';
         $js .= <<"ENDSCRIPT";          $js .= <<"ENDSCRIPT";
   
Line 1920  ENDSCRIPT Line 1921  ENDSCRIPT
     } elsif ($phase eq 'setanon') {      } elsif ($phase eq 'setanon') {
         my $invalid = &mt('The responder threshold you entered is invalid.');          my $invalid = &mt('The responder threshold you entered is invalid.');
         my $alert = &mt('You must enter a positive integer.');          my $alert = &mt('You must enter a positive integer.');
           &js_escape(\$invalid);
           &js_escape(\$alert);
         my $regexp = ' /^\s*\d+\s*$/';          my $regexp = ' /^\s*\d+\s*$/';
         $js .= <<"ENDSCRIPT";          $js .= <<"ENDSCRIPT";
   
Line 1945  ENDSCRIPT Line 1948  ENDSCRIPT
         my $invalid = &mt('The choice entered for disabling the submit button is invalid.');          my $invalid = &mt('The choice entered for disabling the submit button is invalid.');
         my $invalidtimeout = &mt('The timeout you entered for disabling the submit button is invalid.');          my $invalidtimeout = &mt('The timeout you entered for disabling the submit button is invalid.');
         my $alert = &mt('Enter one of: a positive integer, 0 (for no timeout), or leave blank to use domain default');          my $alert = &mt('Enter one of: a positive integer, 0 (for no timeout), or leave blank to use domain default');
           &js_escape(\$invalid);
           &js_escape(\$invalidtimeout);
           &js_escape(\$alert);
         my $regexp = ' /^\s*\d+\s*$/';          my $regexp = ' /^\s*\d+\s*$/';
   
         $js .= <<"ENDSCRIPT";           $js .= <<"ENDSCRIPT"; 
Line 2106  sub course_settings_descrip { Line 2112  sub course_settings_descrip {
                       'sectionnums' => 'Course section number:LON-CAPA section',                        'sectionnums' => 'Course section number:LON-CAPA section',
                       'crosslistings' => 'Crosslisted class:LON-CAPA section',                        'crosslistings' => 'Crosslisted class:LON-CAPA section',
                       'defaultcredits' => 'Credits',                        'defaultcredits' => 'Credits',
                         'autodropfailsafe' => "Failsafe section enrollment count",
                       'selfenrollmgrdc'  => "Course-specific self-enrollment configuration by Domain Coordinator",                        'selfenrollmgrdc'  => "Course-specific self-enrollment configuration by Domain Coordinator",
                       'selfenrollmgrcc'  => "Course-specific self-enrollment configuration by Course personnel",                        'selfenrollmgrcc'  => "Course-specific self-enrollment configuration by Course personnel",
   
Line 2129  sub hidden_form_elements { Line 2136  sub hidden_form_elements {
 sub showcredits {  sub showcredits {
     my ($dom) = @_;      my ($dom) = @_;
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);      my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) {      if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
         return 1;          return 1;
     }      }
 }  }

Removed from v.1.77  
changed lines
  Added in v.1.79.2.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>