Diff for /loncom/interface/lonmodifycourse.pm between versions 1.69 and 1.70

version 1.69, 2014/03/13 14:46:46 version 1.70, 2014/03/17 02:45:25
Line 153  sub print_course_search_page { Line 153  sub print_course_search_page {
         $type = 'Course';          $type = 'Course';
     }      }
     &print_header($r,$type);      &print_header($r,$type);
     my ($filterlist,$filter) = &get_filters();      my ($filterlist,$filter) = &get_filters($dom);
     my ($numtitles,$cctitle,$dctitle,@codetitles);      my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';      my $ccrole = 'cc';
     if ($type eq 'Community') {      if ($type eq 'Community') {
Line 161  sub print_course_search_page { Line 161  sub print_course_search_page {
     }      }
     $cctitle = &Apache::lonnet::plaintext($ccrole,$type);      $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     $dctitle = &Apache::lonnet::plaintext('dc');      $dctitle = &Apache::lonnet::plaintext('dc');
     $r->print(&Apache::lonpickcourse::js_changer());      $r->print(&Apache::loncommon::js_changer());
     if ($type eq 'Community') {      if ($type eq 'Community') {
         $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');          $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
     } else {      } else {
Line 169  sub print_course_search_page { Line 169  sub print_course_search_page {
     }      }
     $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,      $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                                 \$numtitles,'modifycourse',undef,undef,undef,                                                  \$numtitles,'modifycourse',undef,undef,undef,
                                                 \@codetitles,$filter->{'domainfilter'}));                                                  \@codetitles,$dom));
     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 197  sub print_course_selection_page { Line 197  sub print_course_selection_page {
     my $action = '/adm/modifycourse';      my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');      my $dctitle = &Apache::lonnet::plaintext('dc');
     my ($numtitles,@codetitles);      my ($numtitles,@codetitles);
     $r->print(&Apache::lonpickcourse::js_changer());      $r->print(&Apache::loncommon::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::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,      $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                                 \$numtitles,'modifycourse',undef,undef,undef,                                                  \$numtitles,'modifycourse',undef,undef,undef,
                                                 \@codetitles,$filter->{'domainfilter'},                                                  \@codetitles,$dom,$env{'form.form'}));
                                                 $env{'form.form'}));      my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
     if (ref($filter) eq 'HASH') {                                                       undef,undef,undef,\@codetitles);
         $filter->{'domainfilter'} = $dom;  
     }  
     my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,$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;
 }  }
   
 sub get_filters {  sub get_filters {
       my ($dom) = @_;
     my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',      my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',
                       'ownerdomfilter','coursefilter','sincefilter');                        'ownerdomfilter','coursefilter','sincefilter');
     # created filter      # created filter
     my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'form.domainfilter'});      my $loncaparev = &Apache::lonnet::get_server_loncaparev($dom);
     if ($loncaparev ne 'unknown_cmd') {      if ($loncaparev ne 'unknown_cmd') {
         push(@filterlist,'createdfilter');          push(@filterlist,'createdfilter');
     }      }

Removed from v.1.69  
changed lines
  Added in v.1.70


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