--- loncom/interface/loncreateuser.pm 2006/06/27 17:48:53 1.123 +++ loncom/interface/loncreateuser.pm 2006/06/29 17:48:21 1.125.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.123 2006/06/27 17:48:53 albertel Exp $ +# $Id: loncreateuser.pm,v 1.125.2.2 2006/06/29 17:48:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -340,7 +340,7 @@ sub print_user_modification_page { } function setType() { - var crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value; + var crstype = 'Course' rolevals = new Array("$rolevalslist"); if (crstype == 'Group') { if (document.cu.currsec.options[0].text == "$pickcrsfirst") { @@ -415,15 +415,17 @@ ENDSCRIPT sections = document.cu.elements[i+1].value; } var newsecs = document.cu.elements[i+1].value; + var numsplit; if (newsecs != null && newsecs != "") { - var numsplit = newsecs.split(/,/g); + numsplit = newsecs.split(/,/g); numsec = numsec + numsplit.length; } + if ((role == 'st') && (numsec > 1)) { alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.") return; } - else { + else if (numsplit != null) { for (var j=0; j<numsplit.length; j++) { if ((numsplit[j] == 'all') || (numsplit[j] == 'none')) { @@ -1584,7 +1586,7 @@ sub custom_role_editor { } my %lt=&Apache::lonlocal::texthash( 'prv' => "Privilege", - 'crl' => "Course/Group Level", + 'crl' => "Course Level", 'dml' => "Domain Level", 'ssl' => "System Level" ); @@ -1734,7 +1736,7 @@ sub course_level_table { 'new' => "Define new section", 'ssd' => "Set Start Date", 'sed' => "Set End Date", - 'crl' => "Course/Group Level", + 'crl' => "Course Level", 'act' => "Activate", 'rol' => "Role", 'ext' => "Extent", @@ -1765,10 +1767,6 @@ sub course_level_table { foreach ('st','ta','ep','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); - # Was this left in by mistake? - # if ($type eq 'Group') { - # $plrole = &Apache::loncommon::convert_role($plrole,$type); - # } $table .= <<ENDEXTENT; <tr bgcolor="#$bgcol"> <td><input type="checkbox" name="act_$protectedcourse\_$_"></td> @@ -1885,7 +1883,7 @@ sub course_level_dc { '<input type="hidden" name="origdom" value="'.$dcdom.'" />'. '<input type="hidden" name="dccourse" value="" />'; my $courseform='<b>'.&Apache::loncommon::selectcourse_link - ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Group').'</b>'; + ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>'; my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom); my %lt=&Apache::lonlocal::texthash( 'typ' => "Type", @@ -1898,14 +1896,9 @@ sub course_level_dc { 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - my $header = '<h4>'.&mt('Course/Group Level').'</h4>'. - '<table border="2"><tr><th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>'; - my $otheritems = '<tr><td><select name="crstype" onChange="javascript:setType();">'."\n". - ' <option value="">'.&mt('Please select')."\n". - ' <option value="Course">'.&mt('Course')."\n". - ' <option value="Group">'.&mt('Group')."\n". - '</select>'."\n". - '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','".')" /></td>'."\n". + my $header = '<h4>'.&mt('Course Level').'</h4>'. + '<table border="2"><tr><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>'; + my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',".')" /></td>'."\n". '<td><select name="role">'."\n"; foreach ('st','ta','ep','in','cc') { my $plrole=&Apache::lonnet::plaintext($_);