[BACK]Return to loncoursequeueadmin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncoursequeueadmin.pm between versions 1.12.2.6 and 1.12.2.8

version 1.12.2.6, 2010/01/15 15:38:10 version 1.12.2.8, 2010/02/26 23:39:01
Line 976  sub course_creation { Line 976  sub course_creation {
     }      }
     my %reqdetails = &build_batchcreatehash($dom,$context,$details,$owneremail,$domdefs);      my %reqdetails = &build_batchcreatehash($dom,$context,$details,$owneremail,$domdefs);
     my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',      my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',
                   \%reqdetails,$longroles,\$logmsg,\$newusermsg,\$addresult,                    \%reqdetails,$longroles,$logmsg,$newusermsg,$addresult,
                   \$enrollcount,\$output,\$keysmsg,$ownerdom,$ownername,$cnum,$crstype);                    $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype);
     if ($cid eq "/$dom/$cnum") {      if ($cid eq "/$dom/$cnum") {
         $result = 'created';          $result = 'created';
     } else {      } else {
Line 989  sub course_creation { Line 989  sub course_creation {
 sub build_batchcreatehash {  sub build_batchcreatehash {
     my ($dom,$context,$details,$owneremail,$domdefs) = @_;      my ($dom,$context,$details,$owneremail,$domdefs) = @_;
     my %batchhash;      my %batchhash;
     my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};      my @items = qw{owner domain coursehome clonecrs clonedom cloneroster datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
     if ($dom eq 'gcitest') {      if ($dom eq 'gcitest') {
         push(@items,'firstres');          push(@items,'firstres');
     }      }
     if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {      if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
         my $emailenc = &Apache::lonnet::escape($owneremail);          my $emailenc = &escape($owneremail);
         my $owner = $details->{'owner'}.':'.$details->{'domain'};          my $owner = $details->{'owner'}.':'.$details->{'domain'};
         foreach my $item (@items) {          foreach my $item (@items) {
             $batchhash{$item} = $details->{$item};              $batchhash{$item} = $details->{$item};
Line 1077  sub can_clone_course { Line 1077  sub can_clone_course {
                 $canclone = 1;                  $canclone = 1;
             }              }
         }          }
           unless ($canclone) {
               if (&Apache::lonnet::is_course_owner($clonedom,$clonecrs,$uname,$udom)) {
                   $canclone = 1;
               }
           }
     }      }
     return $canclone;      return $canclone;
 }  }
Line 1096  sub queued_selfenrollment { Line 1101  sub queued_selfenrollment {
         }          }
     }      }
     if (keys(%reqs_by_date)) {      if (keys(%reqs_by_date)) {
         my $rolename = &Apache::lonnet::plaintext('st');  
         unless ($notitle) {          unless ($notitle) {
             $output .= '<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />';              $output .= '<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />';
         }          }
Line 1111  sub queued_selfenrollment { Line 1115  sub queued_selfenrollment {
                 foreach my $crs (@{$reqs_by_date{$item}}) {                  foreach my $crs (@{$reqs_by_date{$item}}) {
                     my %courseinfo = &Apache::lonnet::coursedescription($crs);                      my %courseinfo = &Apache::lonnet::coursedescription($crs);
                     my $usec = $selfenrollrequests{$crs}{'section'};                      my $usec = $selfenrollrequests{$crs}{'section'};
                       my $rolename = &Apache::lonnet::plaintext('st',$courseinfo{'type'},$crs);
                     if ($usec eq '') {                      if ($usec eq '') {
                         $usec = &mt('No section');                          $usec = &mt('No section');
                     }                      }
Removed from v.1.12.2.6  
changed lines
  Added in v.1.12.2.8

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