--- loncom/auth/lonroles.pm 2017/03/14 03:49:42 1.269.2.33
+++ loncom/auth/lonroles.pm 2018/09/04 01:55:01 1.269.2.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.269.2.33 2017/03/14 03:49:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.35 2018/09/04 01:55:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -590,6 +590,25 @@ ENDENTERKEY
{$env{'user.name'}.':'.$env{'user.domain'}.
':'.$csec.':'.$role => $now},$cdom,$cnum);
}
+ if (($env{"environment.internal.$cdom.$cnum.$role.adhoc"}) &&
+ (&Apache::lonnet::allowed('vxc',$cdom.'_'.$cnum))) {
+ my $owner = $env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'};
+ my @coowners = split(/,/,$env{'course.'.$env{'request.course.id'}.'.internal.co-owners'});
+ my %auaccess;
+ foreach my $user ($owner,@coowners) {
+ my ($cpname,$cpdom) = split(/:/,$user);
+ my %auroles = &Apache::lonnet::get_my_roles($cpname,$cpdom,'userroles',undef,['au','ca','aa'],[$cdom]);
+ foreach my $key (keys(%auroles)) {
+ my ($auname,$audom,$aurole) = split(/:/,$key);
+ if ($aurole eq 'au') {
+ $auaccess{$cpname} = 1;
+ } else {
+ $auaccess{$auname} = 1;
+ }
+ }
+ }
+ &Apache::lonnet::appenv({'request.course.adhocsrcaccess' => join(',',sort(keys(%auaccess))) });
+ }
my ($feeds,$syllabus_time);
&Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds);
&Apache::lonnet::appenv({'request.course.feeds' => $feeds});
@@ -1529,6 +1548,7 @@ sub findcourse_advice {
'.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'
'.&mt('The start date for automated enrollment has yet to be reached.').'
'.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'
+ '.&mt('Automated enrollment added you to the course in the time since you last logged in.').' '.&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'
');
} else {
$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'
');
@@ -1993,9 +2013,9 @@ sub adhoc_roles_row {
my ($dcdom,$rowtype) = @_;
my $output = &Apache::loncommon::continue_data_table_row()
.' '
- .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
+ .&mt('[_1]Ad hoc[_2] roles in domain [_3]'
,'','',$dcdom)
- .' ';
+ .' -- ';
my $role = 'cc';
my $selectcclink = &courselink($dcdom,$rowtype,$role);
my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
@@ -2023,9 +2043,9 @@ sub adhoc_customroles_row {
if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) {
return &Apache::loncommon::continue_data_table_row()
.' | '
- .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --',
+ .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3]',
'','',$dhdom)
- .' '.&courselink($dhdom,$rowtype,$role);
+ .' -- '.&courselink($dhdom,$rowtype,$role);
}
}
return;
|