--- loncom/interface/lonuserutils.pm 2017/01/02 19:44:07 1.180 +++ loncom/interface/lonuserutils.pm 2017/07/07 02:50:41 1.184 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.180 2017/01/02 19:44:07 raeburn Exp $ +# $Id: lonuserutils.pm,v 1.184 2017/07/07 02:50:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2307,7 +2307,7 @@ sub courses_selector { my $allidlist = $idlist{$codetitles[0]}; $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist); $jscript .= $scripttext; - $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles); + $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,\@codetitles); } } my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom); @@ -2757,7 +2757,7 @@ END .'<input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'} .'</label></span></td></tr></table></fieldset></div>'; } - $output .= "\n".'<br clear="all" />'."\n". + $output .= "\n".'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n". &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); if ($mode eq 'autoenroll') { @@ -3101,7 +3101,14 @@ END } if ($showcheckbox) { $r->print('<td><input type="checkbox" name="'. - 'actionlist" value="'.&HTML::Entities::encode($checkval,'&<>"').'" /></td>'); + 'actionlist" value="'. + &HTML::Entities::encode($checkval,'&<>"').'" />'); + foreach my $item ('start','end') { + $r->print('<input type="hidden" name="'. + &HTML::Entities::encode($checkval.'_'.$item,'&<>"').'"'. + ' value="'.$sdata->[$index{$item}].'" />'); + } + $r->print('</td>'); } else { $r->print('<td> </td>'); } @@ -3115,8 +3122,6 @@ END foreach my $item (@cols) { if ($item eq 'username') { $r->print('<td>'.&print_username_link($mode,\%in).'</td>'); - } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) { - $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.&HTML::Entities::encode($checkval.'_'.$item.'" value="'.$sdata->[$index{$item}],'&<>"').'" /></td>'."\n"); } elsif ($item eq 'status') { my $showitem = $in{$item}; if (defined($ltstatus{$in{$item}})) { @@ -5833,7 +5838,7 @@ sub roles_by_context { } elsif ($context eq 'author') { @allroles = ('ca','aa'); } elsif ($context eq 'domain') { - @allroles = ('li','ad','dg','dh','sc','au','dc'); + @allroles = ('li','ad','dg','dh','da','sc','au','dc'); } return @allroles; }