--- loncom/interface/lonmodifycourse.pm 2016/11/10 21:42:19 1.89
+++ loncom/interface/lonmodifycourse.pm 2017/01/22 19:22:04 1.91
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.89 2016/11/10 21:42:19 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.91 2017/01/22 19:22:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -203,28 +203,24 @@ sub print_course_search_page {
$settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle);
}
} elsif (&Apache::lonnet::allowed('rar',$dom)) {
- my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
- 'adhocroles.'.$dom);
- if (keys(%adhocroles)) {
- my @adhoc = split(',',$adhocroles{'adhocroles.'.$dom});
- if (@adhoc > 1) {
+ my ($roles_by_num,$description,$accessref,$accessinfo) = &Apache::lonnet::get_all_adhocroles($dom);
+ if ((ref($roles_by_num) eq 'ARRAY') && (ref($description) eq 'HASH')) {
+ if (@{$roles_by_num} > 1) {
if ($type eq 'Community') {
- $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].',
- join(', ',@adhoc));
+ $roleoption = &mt('Enter the community with one of the available ad hoc roles');
} elsif ($type eq 'Placement') {
- $roleoption = &mt('Enter the placement test with one of the available ad hoc roles: [_1].',
- join(', ',@adhoc));
+ $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.');
} else {
- $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].',
- join(', ',@adhoc));
+ $roleoption = &mt('Enter the course with one of the available ad hoc roles.');
}
} else {
+ my $rolename = $description->{$roles_by_num->[0]};
if ($type eq 'Community') {
- $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]);
+ $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename);
} elsif ($type eq 'Placement') {
- $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]);
+ $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename);
} else {
- $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]);
+ $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
}
}
}
@@ -245,14 +241,131 @@ sub print_course_search_page {
}
sub print_course_selection_page {
- my ($r,$dom,$domdesc) = @_;
+ my ($r,$dom,$domdesc,$permission) = @_;
my $type = $env{'form.type'};
if (!defined($type)) {
$type = 'Course';
}
&print_header($r,$type);
-# Criteria for course search
+ if ($permission->{'adhocrole'} eq 'custom') {
+ my %lt = &Apache::lonlocal::texthash(
+ title => 'Ad hoc role selection',
+ preamble => 'Please choose an ad hoc role in the course.',
+ cancel => 'Click "OK" to enter the course, or "Cancel" to choose a different course.',
+ );
+ my %jslt = &Apache::lonlocal::texthash (
+ none => 'You are not eligible to use an ad hoc role for the selected course',
+ ok => 'OK',
+ exit => 'Cancel',
+ );
+ &js_escape(\%jslt);
+ $r->print(<<"END");
+
+
+
+
$lt{'preamble'}
+
+
$lt{'cancel'}
+
+END
+ } elsif ($permission->{'adhocrole'} eq 'coord') {
+ $r->print(<<"END");
+
+END
+ }
+
+# Criteria for course search
my ($filterlist,$filter) = &get_filters();
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
@@ -497,29 +610,25 @@ sub print_modification_menu {
}
sub print_adhocrole_selected {
- my ($r,$type) = @_;
+ my ($r,$type,$permission) = @_;
&print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($newrole,$selectrole);
- if (&Apache::lonnet::allowed('ccc',$cdom)) {
+ if ($permission->{'adhocrole'} eq 'coord') {
if ($type eq 'Community') {
$newrole = "co./$cdom/$cnum";
} else {
$newrole = "cc./$cdom/$cnum";
}
$selectrole = 1;
- } elsif (&Apache::lonnet::allowed('rar',$cdom)) {
- my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
- 'adhocroles.'.$cdom);
- if (keys(%adhocroles)) {
- my $possrole = $env{'form.adhocrole'};
- if ($possrole ne '') {
- my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});
- if (grep(/^\Q$possrole\E$/,@adhoc)) {
- my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
- $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
- $selectrole = 1;
- }
+ } elsif ($permission->{'adhocrole'} eq 'custom') {
+ my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
+ if (ref($okroles) eq 'ARRAY') {
+ my $possrole = $env{'form.adhocrole'};
+ if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {
+ my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
+ $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
+ $selectrole = 1;
}
}
}
@@ -1001,7 +1110,7 @@ sub print_course_modification_page {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Instcode').
' '.&mt('Course Code'))."\n".
- ''.
+ ''.
&Apache::lonhtmlcommon::row_closure());
if (($crstype eq 'Course') && (&showcredits($cdom))) {
$r->print(&Apache::lonhtmlcommon::row_title(
@@ -2067,13 +2176,7 @@ function changePage(formname,newphase) {
if ($phase eq 'setparms') {
$js .= $javascript_validations;
} elsif ($phase eq 'courselist') {
- $js .= qq|
-
-function gochoose(cname,cdom,cdesc) {
- document.courselist.pickedcourse.value = cdom+'_'+cname;
- document.courselist.submit();
-}
-
+ $js .= <<"ENDJS";
function hide_searching() {
if (document.getElementById('searching')) {
document.getElementById('searching').style.display = 'none';
@@ -2081,7 +2184,7 @@ function hide_searching() {
return;
}
-|;
+ENDJS
} elsif ($phase eq 'setquota') {
my $invalid = &mt('The quota you entered contained invalid characters.');
my $alert = &mt('You must enter a number');
@@ -2347,6 +2450,7 @@ sub get_permission {
catsettings => 'edit',
processcat => 'edit',
selfenroll => 'edit',
+ adhocrole => 'coord',
);
} elsif (&Apache::lonnet::allowed('rar',$dom)) {
$allowed = 1;
@@ -2358,6 +2462,7 @@ sub get_permission {
setparms => 'view',
catsettings => 'view',
selfenroll => 'view',
+ adhocrole => 'custom',
);
}
return ($allowed,\%permission);
@@ -2412,7 +2517,7 @@ sub handler {
{href=>"javascript:changePage(document.$phase,'courselist')",
text=>$choose_text});
if ($phase eq 'courselist') {
- &print_course_selection_page($r,$dom,$domdesc);
+ &print_course_selection_page($r,$dom,$domdesc,$permission);
} else {
my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
if ($checked eq 'ok') {
@@ -2435,7 +2540,7 @@ sub handler {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'adhocrole')",
text=>$enter_text});
- &print_adhocrole_selected($r,$type);
+ &print_adhocrole_selected($r,$type,$permission);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",