--- loncom/interface/lonuserutils.pm 2013/12/09 21:33:32 1.159 +++ loncom/interface/lonuserutils.pm 2013/12/24 19:15:11 1.160 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.159 2013/12/09 21:33:32 raeburn Exp $ +# $Id: lonuserutils.pm,v 1.160 2013/12/24 19:15:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -401,7 +401,7 @@ sub javascript_validations { my $showcredits; my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); - if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) { + if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) { $showcredits = 1; } @@ -1047,10 +1047,12 @@ sub get_defaultcredits { return unless(($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)); my ($defaultcredits,$domdefcredits); my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); - if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) { + if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) { my $instcode = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'}; if ($instcode) { $domdefcredits = $domdefaults{'officialcredits'}; + } elsif ($env{'course.'.$cdom.'_'.$cnum.'.internal.textbook'}) { + $domdefcredits = $domdefaults{'textbookcredits'}; } else { $domdefcredits = $domdefaults{'unofficialcredits'}; }