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

Diff for /loncom/interface/lonmodifycourse.pm between versions 1.57.2.2 and 1.58

version 1.57.2.2, 2010/09/12 22:09:18 version 1.58, 2011/01/11 22:09:49
Line 149  sub print_course_search_page { Line 149  sub print_course_search_page {
                       'instcodefilter','ownerfilter',                        'instcodefilter','ownerfilter',
                       'coursefilter'];                        'coursefilter'];
     my $filter = {};      my $filter = {};
     my ($numtitles,$cctitle,$dctitle);      my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';      my $ccrole = 'cc';
     if ($type eq 'Community') {      if ($type eq 'Community') {
         $ccrole = 'co';          $ccrole = 'co';
Line 163  sub print_course_search_page { Line 163  sub print_course_search_page {
         $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');          $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
     }         }   
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,      $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
                              undef,undef,$filter,$action,\$numtitles,'modifycourse'));                               undef,undef,$filter,$action,\$numtitles,'modifycourse',
                                undef,undef,undef,\@codetitles));
     if ($type eq 'Community') {      if ($type eq 'Community') {
         $r->print(&mt('Actions available after searching for a community:').'<ul>'.          $r->print(&mt('Actions available after searching for a community:').'<ul>'.
                   '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".                    '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
Line 192  sub print_course_selection_page { Line 193  sub print_course_selection_page {
     my %filter;      my %filter;
     my $action = '/adm/modifycourse';      my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');      my $dctitle = &Apache::lonnet::plaintext('dc');
     my $numtitles;      my ($numtitles,@codetitles);
     $r->print(&Apache::lonpickcourse::js_changer());      $r->print(&Apache::lonpickcourse::js_changer());
     $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');      $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
     $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,      $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
                                        undef,undef,\%filter,$action,\$numtitles));                                         undef,undef,\%filter,$action,\$numtitles,
                                          undef,undef,undef,undef,\@codetitles));
     $filter{'domainfilter'} = $dom;      $filter{'domainfilter'} = $dom;
     my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,      my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
                                                          \%filter,$numtitles);                                                           \%filter,$numtitles,undef,
                                                            undef,undef,\@codetitles);
     &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,      &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
                                                     %courses);                                                      %courses);
     return;      return;
Line 844  sub modify_course { Line 847  sub modify_course {
                 } else {                  } else {
             if (@sections > 0) {              if (@sections > 0) {
                         if ($changed{'code'}) {                          if ($changed{'code'}) {
                               my %crsenv = &Apache::lonnet::get('environment',['internal.co-owners'],$cdom,$cnum);
                               my $coowners = $crsenv{'internal.co-owners'};
                     foreach my $sec (@sections) {                      foreach my $sec (@sections) {
                 if ($sec =~ m/^(.+):/) {                  if ($sec =~ m/^(.+):/) {
                                     my $instsec = $1;                                      my $instsec = $1;
                     my $inst_course_id = $newattr{'coursecode'}.$1;                      my $inst_course_id = $newattr{'coursecode'}.$1;
                                     my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);                                      my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);
             if ($course_check eq 'ok') {              if ($course_check eq 'ok') {
                                         my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});                                          my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
                 unless ($outcome eq 'ok') {                  unless ($outcome eq 'ok') {
                                                                 
             push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');              push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
Line 867  sub modify_course { Line 872  sub modify_course {
                                 if ($sec =~ m/^(.+):/) {                                  if ($sec =~ m/^(.+):/) {
                                     my $instsec = $1;                                      my $instsec = $1;
                                     my $inst_course_id = $newattr{'coursecode'}.$instsec;                                      my $inst_course_id = $newattr{'coursecode'}.$instsec;
                                     my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});                                      my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
                                     unless ($outcome eq 'ok') {                                      unless ($outcome eq 'ok') {
                                         push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));                                          push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
                                     }                                      }
Line 883  sub modify_course { Line 888  sub modify_course {
                 foreach my $xlist (@xlists) {                  foreach my $xlist (@xlists) {
             if ($xlist =~ m/^(.+):/) {              if ($xlist =~ m/^(.+):/) {
                                 my $instxlist = $1;                                  my $instxlist = $1;
                                 my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'});                                  my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'},$coowners);
                 unless ($outcome eq 'ok') {                  unless ($outcome eq 'ok') {
             push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));              push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));
                 }                  }
Line 1037  sub update_coowners { Line 1042  sub update_coowners {
             if ($designhash{$cdom.'.autoassign.co-owners'}) {              if ($designhash{$cdom.'.autoassign.co-owners'}) {
                 my @newcoowners = ();                  my @newcoowners = ();
                 if ($settings->{'internal.co-owners'}) {                  if ($settings->{'internal.co-owners'}) {
                     my @currcoown = split(',',$settings->{'internal.coowners'});                      my @currcoown = split(',',$settings->{'internal.co-owners'});
                     my ($updatecoowners,$delcoowners);                      my ($updatecoowners,$delcoowners);
                     foreach my $person (@currcoown) {                      foreach my $person (@currcoown) {
                         my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);                          my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);
Removed from v.1.57.2.2  
changed lines
  Added in v.1.58

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