--- loncom/interface/loncommon.pm	2004/11/21 04:24:49	1.233
+++ loncom/interface/loncommon.pm	2004/11/23 07:29:24	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.233 2004/11/21 04:24:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.234 2004/11/23 07:29:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -375,12 +375,11 @@ sub selectstudent_link {
 }
 
 sub coursebrowser_javascript {
-    my ($domainfilter,$roleelement)=@_;
+    my ($domainfilter)=@_;
    return (<<ENDSTDBRW);
 <script type="text/javascript" language="Javascript" >
-    var extra_element = "$roleelement" 
     var stdeditbrowser;
-    function opencrsbrowser(formname,uname,udom,desc) {
+    function opencrsbrowser(formname,uname,udom,desc,extra_element) {
         var url = '/adm/pickcourse?';
         var filter;
         if (filter != null) {
@@ -397,8 +396,11 @@ sub coursebrowser_javascript {
         url += 'form=' + formname + '&cnumelement='+uname+
 	                            '&cdomelement='+udom+
                                     '&cnameelement='+desc;
-        if (extra_element != '') {
-            url += '&roleelement=$roleelement';
+        if (extra_element !=null && extra_element != '' && formname == 'rolechoice') {
+            url += '&roleelement='+extra_element;
+            if (domainfilter == null || domainfilter == '') {
+                url += '&domainfilter='+extra_element;
+            }
         }
         var title = 'Course_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
@@ -411,9 +413,9 @@ ENDSTDBRW
 }
 
 sub selectcourse_link {
-   my ($form,$unameele,$udomele,$desc)=@_;
+   my ($form,$unameele,$udomele,$desc,$extra_element)=@_;
     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'");'."'>".&mt('Select Course')."</a>";
+        '","'.$udomele.'","'.$desc.'","'.$extra_element.'");'."'>".&mt('Select Course')."</a>";
 }
 
 =pod