--- loncom/interface/lonpickcourse.pm	2016/10/05 13:59:46	1.119
+++ loncom/interface/lonpickcourse.pm	2016/11/02 22:41:18	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.119 2016/10/05 13:59:46 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.122 2016/11/02 22:41:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,12 +69,12 @@ sub handler {
         $title = 'Selecting '.$type.'(s)';
     }
 
-    # if called when a DC is selecting a course 
-    my $roledom = $env{'form.roleelement'};
+    # if called when a DC or DH is selecting a course 
+    my ($roledom,$rolename) = split(/:/,$env{'form.roleelement'});
     if ($roledom) {
-        $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
+        $roleelement = '<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />';
         $submitopener = &processpick();
-        $autosubmit = 'process_pick("'.$roledom.'")';
+        $autosubmit = 'process_pick("'.$roledom.'","'.$rolename.'")';
     }
     if ($env{'form.typeelement'} ne '') {
         $typeelement = '<input type="hidden" name="typeelement" value="'.$env{'form.typeelement'}.'" />';
@@ -288,7 +288,7 @@ sub processpick {
     }
     my $process_pick = <<"ENDONE";
 <script type="text/javascript">
-function process_pick(dom) {
+function process_pick(dom,rolename) {
     var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value;
     var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value;
     var okDomain = 0;
@@ -297,18 +297,30 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (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
-            opener.document.rolechoice.submit();
+            var courseTarget; 
+            if (rolename == 'cc') {
+                var ccrole = "cc";
+                var pickedType = "$env{'form.type'}";
+                if (pickedType == "Community") {
+                    ccrole = "co";
+                }
+                courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse;
+            } else {
+                if (!/\\W/.test(rolename)) {
+                    courseTarget = "cr/"+pickedDomain+"/"+pickedDomain+"-domainconfig/"+rolename+"./"+pickedDomain+"/"+pickedCourse;
+                }
+            }
+            if ((courseTarget != '') && (courseTarget != undefined)) { 
+                opener.document.title='Role selected. Please stand by.';
+                opener.status='Role selected. Please stand by.';
+                opener.document.rolechoice.newrole.value=courseTarget;
+                opener.document.rolechoice.submit();
+            } else {
+                alert("Invalid role selection");
+                return;
+            }
         }
-    } 
+    }
     else {
         alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
     }
@@ -398,15 +410,17 @@ sub display_matched_courses {
             my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
             my $dctitle = &Apache::lonnet::plaintext('dc');
             my $ccrolechk = ' ';
+            my $possrole;
             my $menuchk = ' checked="checked" ';
             $r->print(
                 '<div class="LC_left_float">'
                .'<fieldset>'
-               .'<legend>'.&mt('Pick action').'</legend>'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'
-               .'&nbsp;');
+               .'<legend>'.&mt('Pick action').'</legend>');
+            my $roleradio = '<span class="LC_nobreak"><label>'.
+                            '<input type="radio" name="phase" value="adhocrole"'.$ccrolechk.'/>'.'&nbsp;';
             if (&Apache::lonnet::allowed('ccc',$crsdom)) {
+                $possrole = 1;
+                $r->print($roleradio);
                 if ($type eq 'Community') {
                     $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
                 } elsif ($type eq 'Placement') {
@@ -417,7 +431,9 @@ sub display_matched_courses {
             } elsif (&Apache::lonnet::allowed('rar',$crsdom)) {
                 my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
                                                                   'adhocroles.'.$crsdom);
-                if (keys(%adhocroles)) {
+                if ($adhocroles{'adhocroles.'.$crsdom} ne '') {
+                    $possrole = 1;
+                    $r->print($roleradio);
                     my @adhoc = split(/,/,$adhocroles{'adhocroles.'.$crsdom});
                     if (@adhoc > 1) {
                         my %adhochash;
@@ -441,12 +457,15 @@ sub display_matched_courses {
                         } else {
                             $r->print(&mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]));
                         }
+                        $r->print('<input type="hidden" name="adhocrole" value="'.$adhoc[0].'" />');
                     }
                 }
             }
-            $r->print('</label></span><br />'
-               .'<span class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if ($possrole) { 
+                $r->print('</label></span><br />');
+            }
+            $r->print('<span class="LC_nobreak"><label>'
+                     .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
             if (&Apache::lonnet::allowed('ccc',$crsdom)) {
                 if ($type eq 'Community') {
                     $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));