--- loncom/interface/lonpickcourse.pm 2013/03/25 04:05:30 1.107 +++ loncom/interface/lonpickcourse.pm 2014/03/11 21:42:18 1.110 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.107 2013/03/25 04:05:30 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.110 2014/03/11 21:42:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -284,7 +284,7 @@ sub create_user_javascript { my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); my ($showcredits,$credits); if (($crstype ne 'Community') && - ($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'})) { + (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'}))) { $showcredits = 1; $credits = $coursedescription{'internal.defaultcredits'}; } @@ -513,7 +513,7 @@ sub display_matched_courses { if (!%courses) { $r->print('

'.&mt('None found').'

'); } elsif ($multiple) { - $r->print(''); + $r->print(''); } $r->print(''. "\n".''."\n". @@ -694,7 +694,8 @@ sub build_filters { || ($formname eq 'modifycourse')) { $officialjs = 1; ($instcodeform,$jscript,$$numtitlesref) = - &instcode_selectors($codedom,'filterpicker',$officialjs,$codetitlesref); + &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker', + $officialjs,$codetitlesref); if ($jscript) { $jscript = ''."\n"; @@ -873,33 +874,6 @@ sub get_coordinator_cloneable { } } -sub instcode_selectors { - my ($codedom,$formname,$officialjs,$codetitles) = @_; - my ($output,%cat_titles,%cat_order,%cat_items); - my ($jscript,$totcodes,$numtitles,$lasttitle) = - &Apache::courseclassifier::instcode_selectors_data($codedom,$formname, - \%cat_items,$codetitles,\%cat_titles,\%cat_order,$officialjs); - if ($numtitles > 0) { - my $official = ' checked="checked" '; - my $unofficial = ''; - if ($env{'form.official'} eq 'off') { - $unofficial = $official; - $official = ''; - } - $output .= ''.&mt('Official course:').' '.(' 'x3).'
'. - &Apache::courseclassifier::build_instcode_selectors($numtitles, - $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order)."\n". - ''."\n". - ''."\n"; - - } - return ($output,$jscript,$numtitles); -} - sub search_courses { my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_; my (%courses,%showcourses,$cloner,$ccrole); @@ -1008,7 +982,7 @@ sub course_chooser { $output = &mt('No rights to clone')."\n"; } } else { - $output = ''."\n"; } return $output;