--- loncom/interface/lonpickcourse.pm	2009/10/30 04:44:56	1.87
+++ loncom/interface/lonpickcourse.pm	2010/03/16 05:11:40	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.87 2009/10/30 04:44:56 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.94 2010/03/16 05:11:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ sub handler {
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
                                'multiple','type','setroles','fixeddom','cloner']);
-    my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
+    my ($type,$title,$jscript,$multelement,$multiple,$roleelement,$typeelement,
         $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
 
     # Get course type - Course or Community.
@@ -75,8 +75,11 @@ sub handler {
         $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
+    if ($env{'form.typeelement'} ne '') {
+        $typeelement = '<input type="hidden" name="typeelement" value="'.$env{'form.typeelement'}.'" />';
+    }
 
-    # if called when a DC is creating a course
+    # if called when a DC is creating a course for another user.
     if ($env{'form.form'} eq 'ccrs') {
         ($cloneruname,$clonerudom) = ($env{'form.cloner'} =~ /^($match_username):($match_domain)$/);
     }
@@ -102,10 +105,7 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        if ($env{'form.form'} eq 'cu') {
-            $loaditem{'onload'} .= 'setRoles();';
-        }
-        $loaditem{'onload'} .= 'setSections();';
+        $loaditem{'onload'} .= 'setRoles();setSections();';
     }
     my $js = &js_changer();
     $r->print(&Apache::loncommon::start_page($title,$js,
@@ -142,8 +142,16 @@ sub handler {
     my $action = '/adm/pickcourse';
     my ($numtitles,$showroles,$nohost);
     if (!$onlyown) {
-        my $filterlist = ['domainfilter','descriptfilter',
-                          'instcodefilter'];
+        my $filterlist = ['domainfilter'];
+        # created filter for DCs only
+        if ($env{'user.adv'} && $env{'form.domainfilter'} &&
+            exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) {
+            my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'form.domainfilter'});
+            if ($loncaparev ne 'unknown_cmd') {
+                push(@{$filterlist},'createdfilter');
+            }
+        }
+        push(@{$filterlist},('descriptfilter','instcodefilter'));
         if ($env{'form.form'} eq 'rules') {
             push(@{$filterlist},'personfilter');
             if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) {
@@ -168,7 +176,7 @@ sub handler {
 
         $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
                                  $filter,$action,\$numtitles,undef,$cloneruname,
-                                 $clonerudom));
+                                 $clonerudom,$typeelement));
     }
 
 # ---------------------------------------------------------------- Get the data
@@ -223,7 +231,12 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            var ccrole = "cc";
+            var pickedType = "$env{'form.type'}";
+            if (pickedType == "Community") {
+                ccrole = "co";
+            }
+            var courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse
             opener.document.title='Role selected. Please stand by.';
             opener.status='Role selected. Please stand by.';
             opener.document.rolechoice.newrole.value=courseTarget
@@ -295,25 +308,34 @@ sub display_matched_courses {
     $r->print('<form name="courselist" method="post" action="'.$action.'">');
     if ($env{'form.form'} eq 'modifycourse') {
         if ($numcourses > 0) {
-            my $cctitle = &Apache::lonnet::plaintext('cc',$type);
-            my $dctitle = &Apache::lonnet::plaintext('dc');
-            my $ccrolechk = ' checked="checked" ';
-            my $menuchk = ' ';
-            if ($env{'form.prevphase'} ne '') {
-                 $ccrolechk = ' ';
-                 $menuchk = ' checked="checked" ';
+            my $ccrole = 'cc';
+            if ($type eq 'Community') {
+                $ccrole = 'co';
             }
+            my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
+            my $dctitle = &Apache::lonnet::plaintext('dc');
+            my $ccrolechk = ' ';
+            my $menuchk = ' checked="checked" ';
             $r->print(
                 '<fieldset>'
                .'<legend>'.&mt('Action').'</legend>'
                .'<div class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
-               .'&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle)
-               .'</label></div>'
+               .'&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
+            } else {
+                $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+            }
+            $r->print('</label></div>'
                .'<div class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'
-               .&mt('View or modify course settings which only a [_1] may modify.',$dctitle)
-               .'</label></div>'
+               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
+            } else {
+                $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+            }
+            $r->print('</label></div>'
                .'</fieldset>'
                .'<br />'
             );
@@ -344,13 +366,17 @@ sub display_matched_courses {
     if (%courses) {
         $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());
+        my $titlehdr = &mt('Course Title');
+        if ($type eq 'Community') {
+            $titlehdr = &mt('Community Title');
+        }
         $r->print('<th>'.&mt('Select').'</th>'
-                 .'<th>'.&mt('Course Title').'</th>'
-                 .'<th>'.&mt('Domain').'</th>'
-                 .'<th>'.&mt('Course Code').'</th>'
-                 .'<th>'.&mt('Owner/Co-owner(s)').'</th>'
-                 .'<th>'.&mt('Type').'</th>'
-                 );
+                 .'<th>'.$titlehdr.'</th>'
+                 .'<th>'.&mt('Domain').'</th>');
+        unless ($type eq 'Community') {
+            $r->print('<th>'.&mt('Course Code').'</th>');
+        }
+        $r->print('<th>'.&mt('Owner/Co-owner(s)').'</th>');
         if ($showroles) {
             $r->print('<th>'.&mt("Role(s) for [_1]",
                 &Apache::loncommon::plainname($env{'form.personfilter'},
@@ -358,6 +384,14 @@ sub display_matched_courses {
         }
         $r->print(&Apache::loncommon::end_data_table_header_row());
     }
+    my %cc_cloneable;
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        my ($coord_cloneable,$warning) =
+            &get_coordinator_cloneable($cloneruname,$clonerudom,$type);
+        if ($coord_cloneable) {
+            map {$cc_cloneable{$_} = 1;} split('&',$coord_cloneable);
+        }
+    }
     foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) {
         foreach my $course (@{$by_descrip{$description}}) {
             $r->print(&Apache::loncommon::start_data_table_row());
@@ -370,17 +404,22 @@ sub display_matched_courses {
                 $instcode = $courses{$course}{'inst_code'};
                 $ttype = $courses{$course}{'type'};
                 if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
-                    my $cloners = $courses{$course}{'cloners'};
-                    if ($cloners ne '') { 
-                        my @cloneable = split(',',$cloners);
-                        if (grep(/^\*$/,@cloneable)) {
-                            $canclone = 1;
-                        }
-                        if (grep(/^\*:\Q$env{'form.clonerudom'}\E$/,@cloneable)) {
-                            $canclone = 1;
-                        }
-                        if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) {
-                            $canclone = 1;
+                    if ($cc_cloneable{$courses{$course}{'cnum'}.':'.$courses{$course}{'domain'}}) {
+                        $canclone = 1;
+                    }
+                    unless ($canclone) {
+                        my $cloners = $courses{$course}{'cloners'};
+                        if ($cloners ne '') { 
+                            my @cloneable = split(',',$cloners);
+                            if (grep(/^\*$/,@cloneable)) {
+                                $canclone = 1;
+                            }
+                            if (grep(/^\*:\Q$env{'form.clonerudom'}\E$/,@cloneable)) {
+                                $canclone = 1;
+                            }
+                            if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) {
+                                $canclone = 1;
+                            }
                         }
                     }
                 }
@@ -395,28 +434,23 @@ sub display_matched_courses {
                 ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
                 push(@owners,&unescape($singleowner));
             }
-            my $ownerstr = join(', ',@owners);
+            my $ownerstr = join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } @owners);
             $r->print('<td>'.&course_chooser($multiple,$cdom,$cnum,$cleandesc,$canclone).'</td>');
             $r->print('<td>'.$description.'</td>');
             $r->print('<td>');
             $r->print(&Apache::lonnet::domain($cdom,'description')?
                       $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
             $r->print('</td>');
-            $r->print('<td>');
-            if ($instcode ne '') {
-                $r->print(&unescape($instcode));
-            } else {
-                $r->print('&nbsp;');
+            unless ($type eq 'Community') { 
+                $r->print('<td>');
+                if ($instcode ne '') {
+                    $r->print(&unescape($instcode));
+                } else {
+                    $r->print('&nbsp;');
+                }
+                $r->print('</td>');
             }
-            $r->print('</td>');
             $r->print('<td>'.$ownerstr.'</td>');
-            $r->print('<td>');
-            if ($ttype ne '') {
-                $r->print(&mt(&unescape($ttype)));
-            } else {
-                $r->print('&nbsp;');
-            }
-            $r->print('</td>');
             if ($showroles) {
                 $r->print('<td>');
                 my $rolestr;
@@ -427,7 +461,7 @@ sub display_matched_courses {
                             my (undef,$crdom,$crname,$crtitle) = split('/',$role);
                             $rolestr .= $crtitle.', ';
                         } else {
-                            $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', ';
+                            $rolestr .= &Apache::lonnet::plaintext($role,$type).', ';
                         }
                     }
                     $rolestr =~ s/\, $//;
@@ -467,6 +501,11 @@ sub display_matched_courses {
                   $env{'form.cnumelement'}.'" />'."\n".  
                   '<input type="hidden" name="cdomelement" value="'.
                   $env{'form.cdomelement'}.'" />'."\n");
+        if ($env{'form.typeelement'} ne '') {
+            $r->print('<input type="hidden" name="typeelement" value="'.
+                      $env{'form.typeelement'}.'" />'."\n");
+
+        }
     }
     if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) {
         $r->print('<input type="hidden" name="fixeddom" value="'.
@@ -488,7 +527,7 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $numtitlesref,$caller,$cloneruname,$clonerudom) = @_;
+        $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement) = @_;
     my ($list,$formname,$fixeddom,$codedom,$jscript);
     $codedom = $env{'request.role.domain'};
     if (defined($env{'form.form'})) {
@@ -500,8 +539,9 @@ sub build_filters {
     unless ($env{'form.interface'} eq 'textual') {
         $onchange = 'javascript:updateFilters(this)';
     }
-    my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform,
-        $instcodeform,$typeselectform,$instcodetitle);
+    my ($domainselectform,$sincefilterform,$createdfilterform,
+        $ownerdomselectform,$persondomselectform,$instcodeform,
+        $typeselectform,$instcodetitle);
     foreach my $item (@{$filterlist}) {
         $filter->{$item} = $env{'form.'.$item};
         if ($item ne 'descriptfilter' && $item ne 'instcodefilter') {
@@ -564,37 +604,43 @@ sub build_filters {
     }
 
     # last course activity filter and selection
-    $filter->{'sincefilter'} = $env{'form.sincefilter'};
-    $filter->{'sincefilter'} =~ s/[^\d-]//g;
-    if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; }
-    $sincefilterform=&Apache::loncommon::select_form($filter->{'sincefilter'},
-       'sincefilter',('-1'=>'',
-                      '86400' => 'today',
-                      '604800' => 'last week',
-                      '2592000' => 'last month',
-                      '7776000' => 'last three months',
-                      '15552000' => 'last six months',
-                      '31104000' => 'last year',
-                      'select_form_order' =>
-                      ['-1','86400','604800','2592000','7776000',
-                      '15552000','31104000']));
-
-    my %lt = (
-              'cac' => &mt("$type Activity"),
-              'cde' => &mt("$type Title"),
-              'cdo' => &mt("$type Domain"),
-              'ins' => &mt('Institutional Code'),
-              'inc' => &mt('Institutional Categorization'),
-              'cow' => &mt("$type Owner/Co-owner"),
-              'cop' => &mt("$type Personnel Includes"),
-              'cog' => &mt('Type')
+    $sincefilterform = &timebased_select_form('sincefilter',$filter);
+
+    # course created filter and selection
+    if (exists($filter->{'createdfilter'})) {
+        $createdfilterform = &timebased_select_form('createdfilter',$filter);
+    }
+
+    my %lt = &Apache::lonlocal::texthash(
+                'cac' => "$type Activity",
+                'ccr' => "$type Created", 
+                'cde' => "$type Title",
+                'cdo' => "$type Domain",
+                'ins' => 'Institutional Code',
+                'inc' => 'Institutional Categorization',
+                'cow' => "$type Owner/Co-owner",
+                'cop' => "$type Personnel Includes",
+                'cog' => 'Type',
              );
 
-    $typeselectform =  '<select name="type" size="1"';
-    if ($onchange) {
-        $typeselectform .= 'onchange="'.$onchange.'"';
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        my $typeval = 'Course';
+        if ($type eq 'Community') {
+            $typeval = 'Community';
+        }
+        $typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';
+    } else {
+        $typeselectform =  '<select name="type" size="1"';
+        if ($onchange) {
+            $typeselectform .= 'onchange="'.$onchange.'"';
+        }
+        $typeselectform .= '>'."\n";
+        foreach my $posstype ('Course','Community') {
+            $typeselectform.='<option value="'.$posstype.'"'.
+                ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
+        }
+        $typeselectform.="</select>";
     }
-    $typeselectform .= '>'."\n";
     
     my ($cloneableonlyform,$cloneabletitle);
     if (exists($filter->{'cloneableonly'})) {
@@ -638,11 +684,6 @@ sub build_filters {
         }
     }
 
-    foreach my $posstype ('Course','Community') {
-        $typeselectform.='<option value="'.$posstype.'"'.
-            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
-    }
-    $typeselectform.="</select>";
     my $output = qq|
 <form method="post" name="filterpicker" action="$action">
 <input type="hidden" name="form" value="$formname" />
@@ -663,6 +704,7 @@ sub build_filters {
 $name_input
 $roleelement
 $multelement
+$typeelement
 |;
         if ($formname eq 'portform') {
             $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
@@ -677,15 +719,24 @@ $multelement
                   .$sincefilterform
                   .&Apache::lonhtmlcommon::row_closure();
     }
+    if ($createdfilterform) {
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'ccr'})
+                  .$createdfilterform
+                  .&Apache::lonhtmlcommon::row_closure();
+    }
     if ($domainselectform) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'})
                   .$domainselectform
                   .&Apache::lonhtmlcommon::row_closure();
     } 
     if ($typeselectform) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
-                  .$typeselectform
-                  .&Apache::lonhtmlcommon::row_closure();
+        if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+            $output .= $typeselectform;
+        } else {
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
+                      .$typeselectform
+                      .&Apache::lonhtmlcommon::row_closure();
+        }
     }
     if ($instcodeform) {
         $output .= &Apache::lonhtmlcommon::row_title($instcodetitle)
@@ -725,27 +776,15 @@ $multelement
                   .&Apache::lonhtmlcommon::row_closure(1);
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box().'<p>';
-    my $warning;
+    my ($coord_cloneable,$warning);
     if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
-        my $cloneruhome=&Apache::lonnet::homeserver($cloneruname,$clonerudom);
-        my $cc_clone;
-        if ($cloneruhome eq 'no_host') {
-            $warning = '<div class="LC_error">'.&mt('Intended course owner does not exist').
-                       '</div>';
-        } else {
-            if ($env{'form.form'} eq 'ccrs') {
-                $output .= '<input type="hidden" name="cloner" value="'.$env{'form.cloner'}.'" />'."\n";
-            }
-            my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
-                                                        'userroles',['active'], ['cc']);
-            foreach my $key (sort(keys(%ccroles))) {
-                my ($cnum,$cdom,$role) = split(':',$key);
-                $cc_clone .= $cdom.':'.$cnum.'&';
-            }
-            $cc_clone =~ s/\&$//;
+        ($coord_cloneable,$warning) = 
+            &get_coordinator_cloneable($cloneruname,$clonerudom,$type);
+        if ($env{'form.form'} eq 'ccrs') {
+            $output .= '<input type="hidden" name="cloner" value="'.$env{'form.cloner'}.'" />'."\n";
         }
-        if ($cc_clone ne '') {
-            $output .= '<input type="hidden" name="cc_clone" value="'.$cc_clone.'" />';
+        if ($coord_cloneable) {
+            $output .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
         }
     }
     $output .= '<input type="hidden" name="updater" value="">'."\n".
@@ -754,6 +793,52 @@ $multelement
     return $jscript.$warning.$output;
 }
 
+sub timebased_select_form {
+    my ($item,$filter) = @_;
+    if (ref($filter) eq 'HASH') {
+        $filter->{$item} = $env{'form.'.$item};
+        $filter->{$item} =~ s/[^\d-]//g;
+        if (!$filter->{$item}) { $filter->{$item}=-1; }
+        return &Apache::loncommon::select_form( 
+                            $filter->{$item},
+                            $item,
+                            (      '-1' => '',
+                                '86400' => &mt('today'),
+                               '604800' => &mt('last week'),
+                              '2592000' => &mt('last month'),
+                              '7776000' => &mt('last three months'),
+                             '15552000' => &mt('last six months'),
+                             '31104000' => &mt('last year'),
+                    'select_form_order' =>
+                           ['-1','86400','604800','2592000','7776000',
+                            '15552000','31104000']));
+    }
+}
+
+sub get_coordinator_cloneable {
+    my ($cloneruname,$clonerudom,$type) = @_;
+    if (&Apache::lonnet::homeserver($cloneruname,$clonerudom) eq 'no_host') {
+        my $warning = '<div class="LC_error">'.&mt('Intended course owner does not exist').
+                   '</div>';
+        return ('',$warning);
+    } else {
+        my ($cc_clone,$ccrole);
+        if ($type eq 'Community') {
+            $ccrole = 'co';
+        } elsif ($type eq 'Course') {
+            $ccrole = 'cc';
+        }
+        my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
+                                                    'userroles',['active'], [$ccrole]);
+        foreach my $key (sort(keys(%ccroles))) {
+            my ($cnum,$cdom,$role) = split(':',$key);
+            $cc_clone .= $cdom.':'.$cnum.'&';
+        }
+        $cc_clone =~ s/\&$//;
+        return ($cc_clone);
+    }
+}
+
 sub instcode_selectors {
     my ($codedom,$formname,$officialjs) = @_;
     my ($output,@codetitles,%cat_titles,%cat_order,%cat_items);
@@ -783,7 +868,12 @@ sub instcode_selectors {
 
 sub search_courses {
     my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_;
-    my (%courses,%showcourses,$cloner);
+    my (%courses,%showcourses,$cloner,$ccrole);
+    if ($type eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if (!$onlyown) {
         $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
         $r->rflush();
@@ -797,8 +887,14 @@ sub search_courses {
                 $filter->{$item}='.';
             }
         }
+        my $now = time;
         my $timefilter = 
-           ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'});
+           ($filter->{'sincefilter'}==-1?1:$now-$filter->{'sincefilter'});
+        my ($createdbefore,$createdafter);
+        if (($filter->{'createdfilter'} ne '') && ($filter->{'createdfilter'} !=-1)) {
+            $createdbefore = $now;
+            $createdafter = $now-$filter->{'createdfilter'};
+        }
         my ($instcodefilter,$regexpok);
         if ($numtitles) {
             if ($env{'form.official'} eq 'on') {
@@ -829,12 +925,13 @@ sub search_courses {
                                           $filter->{'coursefilter'},
                                           undef,undef,$type,$regexpok,undef,undef,
                                           undef,undef,$cloner,$env{'form.cc_clone'},
-                                          $filter->{'cloneableonly'});
+                                          $filter->{'cloneableonly'},
+                                          $createdbefore,$createdafter);
         if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {
             my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'},
                                                          $filter->{'persondomfilter'},
                                                          'userroles',undef,
-                                                         ['cc','in','ad','ep','ta','cr'],
+                                                         [$ccrole,'in','ad','ep','ta','cr'],
                                                          $filter->{'domainfilter'});
             foreach my $role (keys(%rolehash)) {
                 my ($cnum,$cdom,$courserole) = split(':',$role);
@@ -891,9 +988,9 @@ sub gochoose_javascript {
                                  list  => 'courselist',
                                  },
                      'Community' => {
-                                 name  => 'grouppick',
-                                 total => 'grouptotal',
-                                 list  => 'grouplist',
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
                               },
                     );
     my $output .= qq|
@@ -944,13 +1041,19 @@ function gochoose(cname,cdom,cdesc) {
     }
 ENDSCRIPT
     } else {
-        my $name_code;
+        my ($name_code,$type_code);
         if ($env{'form.cnameelement'} ne '') {
             $name_code = 'opener.document.'.$env{'form.form'}.'.'.
                           $env{'form.cnameelement'}.'.value=cdesc;';
         }
+        if ($env{'form.typeelement'} ne '') {
+            $type_code = 'opener.document.'.$env{'form.form'}.'.'.
+                          $env{'form.typeelement'}.'.value=document.courselist.type;';
+        }
+
         $output .= qq|
         $name_code
+        $type_code
         opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
         var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
         if (slct.options == undefined) {
@@ -1092,10 +1195,10 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom,$typeelem)>:
 
 
-Input: 7 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm).
+Input: 11 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm), username and domain of new course owner who wants to clone, $tyepelem 
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements.