[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncreateuser.pm
raeburn
raeburn at source.lon-capa.org
Mon Dec 13 15:53:06 EST 2021
raeburn Mon Dec 13 20:53:06 2021 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface loncreateuser.pm
Log:
- For 2.11
Backport 1.455, 1.456, 1.457
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.406.2.19 loncom/interface/loncreateuser.pm:1.406.2.20
--- loncom/interface/loncreateuser.pm:1.406.2.19 Wed Sep 9 02:16:05 2020
+++ loncom/interface/loncreateuser.pm Mon Dec 13 20:53:06 2021
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.406.2.19 2020/09/09 02:16:05 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.406.2.20 2021/12/13 20:53:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -71,6 +71,7 @@
use Apache::lonuserutils;
use Apache::loncoursequeueadmin;
use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
my $loginscript; # piece of javascript used in two separate instances
my $authformnop;
@@ -2381,8 +2382,8 @@
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
- $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now,
+ $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
@@ -2507,10 +2508,11 @@
if ($usernameset eq 'free') {
my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
$output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
- &mt('Use e-mail address: ').
- '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
- (' 'x2).
- '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
+ '<span class="LC_nobreak">'.&mt('Use e-mail address: ').
+ '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
+ &mt('Yes').'</label>'.(' 'x2).
+ '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
+ &mt('No').'</label></span>'."\n".
'<div id="selfcreateusername" style="display: none; font-size: smaller">'.
'<br /><span class="LC_nobreak">'.&mt('Preferred username').
' <input type="text" name="username" value="" size="20" autocomplete="off"/>'.
@@ -2618,12 +2620,16 @@
&Apache::lonhtmlcommon::row_closure(1);
$rowcount ++;
}
- my $submit_text = &mt('Create account');
- $output .= &Apache::lonhtmlcommon::row_title()."\n".
- '<br /><input type="submit" name="createaccount" value="'.
- $submit_text.'" />'.
- '<input type="hidden" name="type" value="'.$usertype.'" />'.
- &Apache::lonhtmlcommon::row_closure(1);
+ if ($showsubmit) {
+ my $submit_text = &mt('Create account');
+ $output .= &Apache::lonhtmlcommon::row_title()."\n".
+ '<br /><input type="submit" name="createaccount" value="'.
+ $submit_text.'" />';
+ if ($usertype ne '') {
+ $output .= '<input type="hidden" name="type" value="'.$usertype.'" />'.
+ &Apache::lonhtmlcommon::row_closure(1);
+ }
+ }
}
$output .= &Apache::lonhtmlcommon::end_pick_box();
if (wantarray) {
@@ -7387,12 +7393,12 @@
&mt('Context:').'</b><br /><select name="chgcontext">';
my @posscontexts;
if ($context eq 'course') {
- @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
+ @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype');
} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {
@posscontexts = ('any','author','domain');
- }
+ }
foreach my $chgtype (@posscontexts) {
my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {
@@ -7436,6 +7442,7 @@
%lt = &Apache::lonlocal::texthash (
any => 'Any',
automated => 'Automated Enrollment',
+ chgtype => 'Enrollment Type/Lock Change',
updatenow => 'Roster Update',
createcourse => 'Course Creation',
course => 'User Management in course',
More information about the LON-CAPA-cvs
mailing list