loncom/interface/lonuserutils.pm - diff

Return to lonuserutils.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonuserutils.pm between versions 1.159 and 1.160

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

version 1.159, 2013/12/09 21:33:32	version 1.160, 2013/12/24 19:15:11
Line 401 sub javascript_validations {	Line 401 sub javascript_validations {

my $showcredits;	my $showcredits;
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);	my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
if ($domdefaults{'officialcredits'} \|\| $domdefaults{'unofficialcredits'}) {	if ($domdefaults{'officialcredits'} \|\| $domdefaults{'unofficialcredits'} \|\| $domdefaults{'textbookcredits'}) {
$showcredits = 1;	$showcredits = 1;
}	}

Line 1047 sub get_defaultcredits {	Line 1047 sub get_defaultcredits {
return unless(($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/));	return unless(($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/));
my ($defaultcredits,$domdefcredits);	my ($defaultcredits,$domdefcredits);
my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);	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'};	my $instcode = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
if ($instcode) {	if ($instcode) {
$domdefcredits = $domdefaults{'officialcredits'};	$domdefcredits = $domdefaults{'officialcredits'};
	} elsif ($env{'course.'.$cdom.'_'.$cnum.'.internal.textbook'}) {
	$domdefcredits = $domdefaults{'textbookcredits'};
} else {	} else {
$domdefcredits = $domdefaults{'unofficialcredits'};	$domdefcredits = $domdefaults{'unofficialcredits'};
}	}

Removed from v.1.159
changed lines
	Added in v.1.160