--- loncom/interface/loncreateuser.pm 2014/01/15 18:47:56 1.386
+++ loncom/interface/loncreateuser.pm 2014/02/05 18:02:16 1.388
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.386 2014/01/15 18:47:56 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.388 2014/02/05 18:02:16 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1273,6 +1273,7 @@ ENDTITLE
my $personal_table =
&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});
+ # (Do not offer Disable Safeguard here)
$r->print($personal_table);
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1381,13 +1382,10 @@ ENDCHANGEUSER
}
$r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"'.
"\n".'
');
- my ($personal_table,$showforceid) =
+ my $personal_table =
&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
- if ($showforceid) {
- $r->print('
'.&Apache::lonuserutils::forceid_change($context).'
');
- }
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());
@@ -2170,7 +2168,7 @@ sub modify_login_block {
sub personal_data_display {
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
- my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
+ my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
my $rowcount = 0;
@@ -2257,8 +2255,8 @@ sub personal_data_display {
} else {
$row .= $userenv{$item};
}
- if ($item eq 'id') {
- $showforceid = $canmodify{$item};
+ if (($item eq 'id') && ($canmodify{$item})) {
+ $row .= '
'.&Apache::lonuserutils::forceid_change($context);
}
}
$row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -2309,7 +2307,7 @@ sub personal_data_display {
if ($context eq 'selfcreate') {
return($output,$rowcount,$editable);
} else {
- return ($output,$showforceid);
+ return $output;
}
} else {
return $output;
@@ -4436,25 +4434,43 @@ sub set_custom_role {
$sysrole.=':'.$item;
}
}
- $r->print('
Defining Role: '.
- &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));
+ # Assign role; Compile and show result
+ my $errmsg;
+ my $result =
+ &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole);
+ if ($result ne 'ok') {
+ $errmsg = ': '.$result;
+ }
+ my $message =
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Defining Role').$errmsg, ($result eq 'ok' ? 0 : 1));
if ($env{'request.course.id'}) {
my $url='/'.$env{'request.course.id'};
$url=~s/\_/\//g;
- $r->print('
'.&mt('Assigning Role to Self').': '.
- &Apache::lonnet::assigncustomrole($env{'user.domain'},
- $env{'user.name'},
- $url,
- $env{'user.domain'},
- $env{'user.name'},
- $rolename,undef,undef,undef,$context));
+ $result =
+ &Apache::lonnet::assigncustomrole(
+ $env{'user.domain'},$env{'user.name'},
+ $url,
+ $env{'user.domain'},$env{'user.name'},
+ $rolename,undef,undef,undef,$context);
+ if ($result ne 'ok') {
+ $errmsg = ': '.$result;
+ }
+ $message .=
+ '
'
+ .&Apache::lonhtmlcommon::confirm_success(
+ &mt('Assigning Role to Self').$errmsg, ($result eq 'ok' ? 0 : 1));
}
$r->print(
- '
'
- .&mt('Create or edit another custom role')
- .'
'
+ &Apache::loncommon::confirmwrapper($message)
+ .'
'
+ .&Apache::lonhtmlcommon::actionbox([
+ '
'
+ .&mt('Create or edit another custom role')
+ .''])
.'
'
+ .&Apache::lonhtmlcommon::echo_form_input([])
+ .''
);
}