version 1.511, 2015/10/05 16:23:49
|
version 1.514, 2016/03/02 14:06:30
|
Line 914 sub render_resource {
|
Line 914 sub render_resource {
|
my $nonLinkedText = ''; # stuff after resource title not in link |
my $nonLinkedText = ''; # stuff after resource title not in link |
|
|
my $link = $params->{"resourceLink"}; |
my $link = $params->{"resourceLink"}; |
|
if ($resource->ext()) { |
|
$link =~ s/\#.+(\?)/$1/g; |
|
} |
|
|
# The URL part is not escaped at this point, but the symb is... |
# The URL part is not escaped at this point, but the symb is... |
|
|
Line 2118 sub change_user {
|
Line 2121 sub change_user {
|
|
|
|
|
|
|
# Now clear the parm cache and reconstruct the parm hash fromt he big_hash |
# Now clear the parm cache and reconstruct the parm hash from the big_hash |
# param.xxxx keys. |
# param.xxxx keys. |
|
|
$self->{PARM_CACHE} = {}; |
$self->{PARM_CACHE} = {}; |
Line 2878 sub getcourseparam {
|
Line 2881 sub getcourseparam {
|
# |
# |
# We want the course level stuff from the way |
# We want the course level stuff from the way |
# parmval_real operates |
# parmval_real operates |
# TODO: Fator some of this stuff out of |
# TODO: Factor some of this stuff out of |
# both parmval_real and here |
# both parmval_real and here |
# |
# |
my $courselevel = $cid . '.' . $what; |
my $courselevel = $cid . '.' . $what; |
Line 2895 sub getcourseparam {
|
Line 2898 sub getcourseparam {
|
} |
} |
# Try for the group's course level option: |
# Try for the group's course level option: |
|
|
if ($uname ne '' and defined($courseopt)) { |
if ($cgroup ne '' and defined($courseopt)) { |
if (defined($$courseopt{$grplevel})) { |
if (defined($$courseopt{$grplevel})) { |
return $$courseopt{$grplevel}; |
return $$courseopt{$grplevel}; |
} |
} |
Line 2903 sub getcourseparam {
|
Line 2906 sub getcourseparam {
|
|
|
# Try for section level parameters: |
# Try for section level parameters: |
|
|
if ($csec and defined($courseopt)) { |
if ($csec ne '' and defined($courseopt)) { |
if (defined($$courseopt{$seclevel})) { |
if (defined($$courseopt{$seclevel})) { |
return $$courseopt{$seclevel}; |
return $$courseopt{$seclevel}; |
} |
} |
} |
} |
# Try for 'additional' course parameterse: |
# Try for 'additional' course parameters: |
|
|
if (defined($courseopt)) { |
if (defined($courseopt)) { |
if (defined($$courseopt{$courselevel})) { |
if (defined($$courseopt{$courselevel})) { |
Line 4529 sub duedate {
|
Line 4532 sub duedate {
|
my $due_date=$self->parmval("duedate", $part); |
my $due_date=$self->parmval("duedate", $part); |
if ($interval[0] =~ /\d+/) { |
if ($interval[0] =~ /\d+/) { |
my $first_access=&Apache::lonnet::get_first_access($interval[1], |
my $first_access=&Apache::lonnet::get_first_access($interval[1], |
$self->symb); |
$self->{SYMB}); |
if (defined($first_access)) { |
if (defined($first_access)) { |
my $interval = $first_access+$interval[0]; |
my $interval = $first_access+$interval[0]; |
$date = (!$due_date || $interval < $due_date) ? $interval |
$date = (!$due_date || $interval < $due_date) ? $interval |
Line 4611 sub part_display {
|
Line 4614 sub part_display {
|
my $self= shift(); my $partID = shift(); |
my $self= shift(); my $partID = shift(); |
if (! defined($partID)) { $partID = '0'; } |
if (! defined($partID)) { $partID = '0'; } |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display', |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display', |
$self->symb); |
$self->{SYMB}); |
if (! defined($display) || $display eq '') { |
if (! defined($display) || $display eq '') { |
$display = $partID; |
$display = $partID; |
} |
} |