--- loncom/interface/loncreateuser.pm 2014/02/15 19:31:22 1.392
+++ loncom/interface/loncreateuser.pm 2014/02/19 17:12:52 1.394
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.392 2014/02/15 19:31:22 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.394 2014/02/19 17:12:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1271,11 +1271,9 @@ ENDTITLE
}
$r->print('
'.$title.'
'."\n");
$r->print('');
- my $personal_table =
- &personal_data_display($ccuname,$ccdomain,$newuser,$context,
- $inst_results{$ccuname.':'.$ccdomain});
- # (Do not offer Disable Safeguard here)
- $r->print($personal_table);
+ $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
+ $inst_results{$ccuname.':'.$ccdomain}));
+ # Option to disable student/employee ID conflict checking not offerred for new users.
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
'default','hide');
@@ -1376,10 +1374,8 @@ ENDAUTH
}
$r->print('
'.$title.'
'."\n");
$r->print('
');
- my $personal_table =
- &personal_data_display($ccuname,$ccdomain,$newuser,$context,
- $inst_results{$ccuname.':'.$ccdomain});
- $r->print($personal_table);
+ $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
+ $inst_results{$ccuname.':'.$ccdomain}));
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('
'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'
'.
&Apache::loncommon::start_data_table());
@@ -1475,7 +1471,8 @@ ENDNOTOOLSPRIV
}
$r->print('
'."\n");
} else {
- $r->print('
print('
'.
+ '
print(' onclick="auth_check()" \>'."\n");
} else {
$r->print('onclick="this.form.submit()" \>'."\n");
}
} else {
- $r->print('
'.
+ $r->print(' '.
+ ''.
+ '
'.
&mt('Back to previous page').'');
}
} else {
$r->print(&course_level_table(\%inccourses,$showcredits,$defaultcredits));
- $r->print('
'."\n");
+ $r->print(''.
+ '
'."\n");
}
}
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
$r->print('');
- $r->print('');
+ $r->print('
');
return;
}
@@ -1861,7 +1863,7 @@ sub display_existing_roles {
} else {
$contextrole = &mt('Existing Roles in this Domain');
}
- $r->print(''.
+ $r->print('
'.
'
'.
&Apache::loncommon::start_data_table("LC_createuser").
&Apache::loncommon::start_data_table_header_row().
@@ -2234,11 +2236,11 @@ sub personal_data_display {
if (($context eq 'selfcreate') && ($newuser eq 'email')) {
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'},undef,
'LC_oddrow_value')."\n".
- '';
+ '';
$rowcount ++;
$output .= &Apache::lonhtmlcommon::row_closure(1);
- my $upassone = '';
- my $upasstwo = '';
+ my $upassone = '';
+ my $upasstwo = '';
$output .= &Apache::lonhtmlcommon::row_title(&mt('Password'),
'LC_pick_box_title',
'LC_oddrow_value')."\n".
@@ -2264,7 +2266,7 @@ sub personal_data_display {
} else {
if ($context eq 'selfcreate') {
if ($canmodify{$item}) {
- $row .= '';
+ $row .= '';
$editable ++;
} else {
$hiderow = 1;
@@ -2280,9 +2282,9 @@ sub personal_data_display {
} else {
if ($canmodify{$item}) {
if ($newuser eq 'email') {
- $row .= '';
+ $row .= '';
} else {
- $row .= '';
+ $row .= '';
}
$editable ++;
} else {
@@ -2296,12 +2298,12 @@ sub personal_data_display {
} else {
if ($canmodify{$item}) {
$row .= '';
+ if (($item eq 'id') && (!$newuser)) {
+ $row .= '
'.&Apache::lonuserutils::forceid_change($context);
+ }
} else {
$row .= $userenv{$item};
}
- if (($item eq 'id') && ($canmodify{$item})) {
- $row .= '
'.&Apache::lonuserutils::forceid_change($context);
- }
}
$row .= &Apache::lonhtmlcommon::row_closure(1);
if (!$hiderow) {
@@ -4177,6 +4179,7 @@ sub custom_role_editor {
my $dompriv='';
my $coursepriv='';
my $body_top;
+ my $newrole;
my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
@@ -4189,6 +4192,7 @@ sub custom_role_editor {
$syspriv =~ s/bre\&S//;
}
} else {
+ $newrole = 1;
$body_top .= &mt('New Role').' "';
$roledef='';
}
@@ -4458,6 +4462,7 @@ sub set_custom_role {
bread_crumbs_component => 'User Management'};
$r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args));
+ my $newrole;
my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
@@ -4468,6 +4473,7 @@ sub set_custom_role {
} else {
$r->print(&mt('New Role').' "');
$roledef='';
+ $newrole = 1;
}
$r->print($rolename.'"');
# ------------------------------------------------------- What can be assigned?