--- loncom/interface/lonpickcourse.pm 2010/11/13 14:43:08 1.93.2.3 +++ loncom/interface/lonpickcourse.pm 2010/06/25 04:37:49 1.98 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.93.2.3 2010/11/13 14:43:08 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.98 2010/06/25 04:37:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -143,6 +143,7 @@ sub handler { my ($numtitles,$showroles,$nohost); if (!$onlyown) { my $filterlist = ['domainfilter']; + # created filter for DCs only if ($env{'user.adv'} && $env{'form.domainfilter'} && exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'}) && $env{'form.form'} ne 'portform') { @@ -152,7 +153,6 @@ sub handler { } } push(@{$filterlist},('descriptfilter','instcodefilter')); - if ($env{'form.form'} eq 'rules') { push(@{$filterlist},'personfilter'); if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) { @@ -418,7 +418,7 @@ sub display_matched_courses { $canclone = 1; } } - unless ($canclone) { + unless ($canclone) { if ($cc_cloneable{$cnum.':'.$cdom}) { $canclone = 1; } @@ -551,10 +551,7 @@ sub build_filters { } else { $formname = $caller; } - my $onchange; - unless ($env{'form.interface'} eq 'textual') { - $onchange = 'javascript:updateFilters(this)'; - } + my $onchange = 'javascript:updateFilters(this)'; my ($domainselectform,$sincefilterform,$createdfilterform, $ownerdomselectform,$persondomselectform,$instcodeform, $typeselectform,$instcodetitle); @@ -619,7 +616,6 @@ sub build_filters { } } - # last course activity filter and selection $sincefilterform = &timebased_select_form('sincefilter',$filter); @@ -630,7 +626,7 @@ sub build_filters { my %lt = &Apache::lonlocal::texthash( 'cac' => "$type Activity", - 'ccr' => "$type Created", + 'ccr' => "$type Created", 'cde' => "$type Title", 'cdo' => "$type Domain", 'ins' => 'Institutional Code', @@ -816,10 +812,10 @@ sub timebased_select_form { $filter->{$item} = $env{'form.'.$item}; $filter->{$item} =~ s/[^\d-]//g; if (!$filter->{$item}) { $filter->{$item}=-1; } - return &Apache::loncommon::select_form( + return &Apache::loncommon::select_form( $filter->{$item}, $item, - ( '-1' => '', + { '-1' => '', '86400' => &mt('today'), '604800' => &mt('last week'), '2592000' => &mt('last month'), @@ -828,17 +824,13 @@ sub timebased_select_form { '31104000' => &mt('last year'), 'select_form_order' => ['-1','86400','604800','2592000','7776000', - '15552000','31104000'])); + '15552000','31104000']}); } } sub get_coordinator_cloneable { my ($cloneruname,$clonerudom,$type) = @_; - if (($cloneruname!~/\w/) || ($clonerudom!~/\w/)) { - my $warning = '