--- loncom/interface/lonmodifycourse.pm 2022/02/06 21:36:59 1.97
+++ loncom/interface/lonmodifycourse.pm 2023/08/03 15:57:23 1.102
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.97 2022/02/06 21:36:59 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.102 2023/08/03 15:57:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -411,7 +411,8 @@ sub get_filters {
sub print_modification_menu {
my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
&print_header($r,$type);
- my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum,
+ $extendedtype);
if (ref($coursehash) eq 'HASH') {
$cdom = $coursehash->{'domain'};
$cnum = $coursehash->{'num'};
@@ -431,6 +432,7 @@ sub print_modification_menu {
'selfenroll' => 'View/Modify Self-Enrollment configuration',
'setpostsubmit' => 'View/Modify submit button behavior, post-submission',
'setltiauth' => 'View/Modify re-authentication requirement for LTI launch of deep-linked item',
+ 'setexttool' => 'View/Modify External Tools permissions',
);
} else {
%linktext = (
@@ -439,16 +441,17 @@ sub print_modification_menu {
'selfenroll' => 'View Self-Enrollment configuration',
'setpostsubmit' => 'View submit button behavior, post-submission',
'setltiauth' => 'View re-authentication requirement for LTI launch of deep-linked item',
+ 'setexttool' => 'View External Tools permissions',
);
}
if ($type eq 'Community') {
if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Community Settings';
- $linktext{'setparms'} = 'View/Modify community owner';
+ $linktext{'setparms'} = 'View/Modify community owner, self-enrollment and table lifetime';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
} else {
$categorytitle = 'View Community Settings';
- $linktext{'setparms'} = 'View community owner';
+ $linktext{'setparms'} = 'View community owner, self-enrollment and table lifetime';
$linktext{'catsettings'} = 'View catalog settings for community';
}
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
@@ -473,11 +476,15 @@ sub print_modification_menu {
}
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
$setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook'],
+ $cdom,$cnum);
+ $extendedtype = ucfirst(&Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings));
}
my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.');
my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.');
- my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item');
+ my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item.');
+ my $exttool_text = &mt('Override default permissions for external tools use for this specific course.');
$linktext{'viewparms'} = 'Display current settings for automated enrollment';
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
@@ -567,67 +574,31 @@ sub print_modification_menu {
permission => $permission->{'setltiauth'},
linktitle => '',
},
+ {
+ linktext => $linktext{'setexttool'},
+ icon => 'exttool.png',
+ #help => '',
+ url => &phaseurl('setexttool'),
+ permission => $permission->{'setexttool'},
+ linktitle => '',
+ },
]
},
);
- my $menu_html =
+ $r->print(
'
'
- .&mt('View/Modify settings for: [_1]',
- ''.$cdesc.' ')
- .' '."\n".'';
- if ($type eq 'Community') {
- $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
- } else {
- $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
- }
- $menu_html .= '
'."\n".'';
- if ($type eq 'Community') {
- $menu_html .= ''.&mt('Community owner (permitted to assign Coordinator roles in the community).').' '."\n".
- ''.&mt('Override defaults for who configures self-enrollment for this specific community').' '."\n";
- } else {
- $menu_html .= ''.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').' '."\n".
- ''.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").' '."\n";
- if (($type ne 'Placement') && &showcredits($dom)) {
- $menu_html .= ''.&mt('Default credits earned by student on course completion.').' '."\n";
- }
- $menu_html .= ' '.&mt('Override defaults for who configures self-enrollment for this specific course.').' '."\n";
- }
- $menu_html .= ''.$mysqltables_text.' '."\n".
- ''.$setquota_text.' '."\n".
- ''.$setuploadquota_text.' '."\n".
- ''.$anon_text.' '."\n".
- ''.$postsubmit_text.' '."\n".
- ''.$ltiauth_text.' '."\n";
- my ($categories_link_start,$categories_link_end);
- if ($permission->{'catsettings'} eq 'edit') {
- $categories_link_start = '';
- $categories_link_end = ' ';
- }
- foreach my $item (@additional_params) {
- if ($type eq 'Community') {
- if ($item eq 'togglecats') {
- $menu_html .= ' '.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).' '."\n";
- } elsif ($item eq 'categorize') {
- $menu_html .= ' '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).' '."\n";
- }
- } else {
- if ($item eq 'togglecats') {
- $menu_html .= ' '.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).' '."\n";
- } elsif ($item eq 'categorize') {
- $menu_html .= ' '.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).' '."\n";
- }
- }
+ .&mt($type).': '.$cdesc.' '
+ .''."\n");
+ if ($extendedtype) {
+ $r->print(''.&mt('Type').': '.&mt("$extendedtype $type").' ');
}
- $menu_html .=
- ' '
- .'');
+ .&hidden_form_elements()
+ .&Apache::lonhtmlcommon::generate_menu(@menu)
+ .'');
return;
}
@@ -745,30 +716,32 @@ sub print_settings_display {
$setparms_link_start = '';
$setparms_link_end = ' ';
}
- $r->print(''.&mt('Current automated enrollment settings for:').
- ' '.$cdesc.' '.
+ $r->print(''.&mt('Current automated enrollment settings').' '."\n".
+ ''.&mt($type).': '.$cdesc.' '."\n".
''
- );
+ $r->print(''.
+ $lt{'cour'}.'
'.$disp_table.''."\n".
+ &hidden_form_elements().'
'.
+ ''."\n");
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
}
sub print_setquota {
my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
my $lctype = lc($type);
- my $headline = &mt("Set disk space quotas for $lctype: [_1]",
- ''.$cdesc.' ');
+ my $headline = ''.&mt("Set disk space quotas for $lctype").' '."\n".
+ ''.&mt($type).': '.$cdesc.' '."\n";
my %lt = &Apache::lonlocal::texthash(
'gpqu' => 'Disk space for storage of group portfolio files',
'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor',
@@ -783,15 +756,20 @@ sub print_setquota {
$cdom,$cnum);
my $coursequota = $settings{'internal.coursequota'};
my $uploadquota = $settings{'internal.uploadquota'};
- if ($coursequota eq '') {
- $coursequota = $staticdefaults{'coursequota'};
- }
- if ($uploadquota eq '') {
+ if (($uploadquota eq '') || ($coursequota eq '')) {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
- $uploadquota = $domdefs{$quotatype.'quota'};
if ($uploadquota eq '') {
- $uploadquota = $staticdefaults{'uploadquota'};
+ $uploadquota = $domdefs{$quotatype.'quota'};
+ if ($uploadquota eq '') {
+ $uploadquota = $staticdefaults{'uploadquota'};
+ }
+ }
+ if ($coursequota eq '') {
+ $coursequota = $domdefs{$quotatype.'coursequota'};
+ if ($coursequota eq '') {
+ $coursequota = $staticdefaults{'coursequota'};
+ }
}
}
&print_header($r,$type);
@@ -805,8 +783,8 @@ sub print_setquota {
$submit = ' ';
}
$r->print(<
-$headline
$porthelpitem $lt{'gpqu'}: MB
@@ -819,9 +797,12 @@ $uploadhelpitem $lt{'upqu'}:
$hidden_elements
-$lt{'back'}
ENDDOCUMENT
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -856,17 +837,21 @@ sub print_set_anonsurvey_threshold {
$submit = ' ';
}
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
+ my $showtype = &mt($type);
$r->print(<$lt{'resp'}
+$showtype: $cdesc
$hidden_elements
-$lt{'back'}
ENDDOCUMENT
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -919,40 +904,37 @@ sub print_postsubmit_config {
$submit = ' ';
}
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
+ my $showtype = &mt($type);
$r->print(<$lt{'conf'}
+$showtype: $cdesc
ENDDOCUMENT
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
return unless (ref($settings) eq 'HASH');
- my $lctype = lc($type);
- unless (($type eq 'Community') || ($type eq 'Placement')) {
- $lctype = 'unofficial';
- if ($settings->{'internal.coursecode'}) {
- $lctype = 'official';
- } elsif ($settings->{'internal.textbook'}) {
- $lctype = 'textbook';
- }
- }
+ my $lctype = &get_lctype($type,$settings);
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
my $postsubtimeout = 60;
@@ -968,6 +950,22 @@ sub domain_postsubtimeout {
return $postsubtimeout;
}
+sub get_lctype {
+ my ($type,$settings) = @_;
+ my $lctype = lc($type);
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
+ $lctype = 'unofficial';
+ if (ref($settings) eq 'HASH') {
+ if ($settings->{'internal.coursecode'}) {
+ $lctype = 'official';
+ } elsif ($settings->{'internal.textbook'}) {
+ $lctype = 'textbook';
+ }
+ }
+ }
+ return $lctype;
+}
+
sub print_catsettings {
my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
&print_header($r,$type);
@@ -985,8 +983,9 @@ sub print_catsettings {
$lt{'categ'} = &mt('Categorize Community');
$lt{'assi'} = &mt('Assign one or more subcategories to this community.');
}
- $r->print(''."\n");
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1145,10 +1161,14 @@ sub print_course_modification_page {
}
&print_header($r,$crstype,$javascript_validations);
my $dctitle = &Apache::lonnet::plaintext('dc');
- my $mainheader = &modifiable_only_title($crstype);
my $hidden_elements = &hidden_form_elements();
- $r->print('');
+ $r->print('');
+ my @actions =
+ (''.
+ &mt('Pick another action').' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1265,11 +1289,15 @@ sub print_selfenrollconfig {
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print(''.&mt('Self-enrollment with a student role in: [_1]',
- ''.$cdesc.' ').' '."\n");
+ $r->print(''.&mt('Self-enrollment with a student role').' '."\n".
+ ''.&mt($type).': '.$cdesc.' '."\n");
&Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
$cdom,$cnum,\%currsettings,
&hidden_form_elements(),$readonly);
+ my @actions =
+ (''.
+ &mt('Pick another action').' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1288,10 +1316,10 @@ sub print_set_ltiauth {
);
my ($domdef,$checkeddom,$checkedcrs,$domdefdisplay,$divsty,$authok,$authno);
$domdef = 0;
- $checkeddom = 'checked="checked "';
+ $checkeddom = ' checked="checked"';
$domdefdisplay = $lt{'logi'};
$divsty = 'display:none';
- $authno = 'checked="checked" ';
+ $authno = ' checked="checked"';
my %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
@@ -1308,7 +1336,7 @@ sub print_set_ltiauth {
$checkeddom = '';
$divsty = 'display:inline-block';
if ($ltiauth) {
- $authok = 'checked="checked "';
+ $authok = ' checked="checked"';
}
}
&print_header($r,$type);
@@ -1320,32 +1348,161 @@ sub print_set_ltiauth {
$submit = ' ';
}
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_LTI_Authen');
+ my $showtype = &mt($type);
$r->print(<$helpitem $lt{'requ'}
+$showtype: $cdesc
+ENDDOCUMENT
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ return;
+}
+
+sub print_set_exttool {
+ my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my %titles = &exttool_titles($type);
+ my ($domdef,$domdefdom,$checkeddom,$checkedcrs,$domdefdisplay,$divsty);
+ $domdef = 0;
+ $domdefdom = 1;
+ $checkeddom = ' checked="checked"';
+ $divsty = 'display:none';
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode',
+ 'internal.textbook'],$cdom,$cnum);
+ my $lctype = &get_lctype($type,\%settings);
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+ if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+ if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') {
+ if (exists($domconfig{'coursedefaults'}{'exttool'}{$lctype})) {
+ $domdef = $domconfig{'coursedefaults'}{'exttool'}{$lctype};
+ }
+ }
+ if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
+ if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) {
+ $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype};
+ }
+ }
+ }
+ if ($domdef && $domdefdom) {
+ $domdefdisplay = $titles{'both'};
+ } elsif ($domdef) {
+ $domdefdisplay = $titles{'crs'};
+ } elsif ($domdefdom) {
+ $domdefdisplay = $titles{'dom'};
+ } else {
+ $domdefdisplay = $titles{'none'};
+ }
+ my %settings = &Apache::lonnet::get('environment',['internal.exttool'],$cdom,$cnum);
+ my $crsexttool = $settings{'internal.exttool'};
+ my %crschecked = (
+ both => ' checked="checked"',
+ dom => '',
+ crs => '',
+ none => '',
+ );
+ if ($crsexttool ne '') {
+ $checkedcrs = $checkeddom;
+ $checkeddom = '';
+ $divsty = 'display:inline-block';
+ foreach my $option ('both','dom','crs','none') {
+ if ($crsexttool eq $option) {
+ $crschecked{$option} = ' checked="checked"';
+ } else {
+ $crschecked{$option} = '';
+ }
+ }
+ }
+ &print_header($r,$type);
+ my $hidden_elements = &hidden_form_elements();
+ my ($disabled,$submit);
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ } else {
+ $submit = ' ';
+ }
+ my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_External_Tool');
+ my $showtype = &mt($type);
+ $r->print(<$helpitem $titles{'extt'}
+$showtype: $cdesc
+
ENDDOCUMENT
+ my @actions =
+ (''.
+ $titles{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
+sub exttool_titles {
+ my ($type) = @_;
+ my %titles = &Apache::lonlocal::texthash(
+ 'extt' => 'External Tool permissions',
+ 'none' => 'Use of external tools not permitted',
+ 'crs' => 'Only external tools defined in course may be used',
+ 'dom' => 'Only external tools defined in domain may be used',
+ 'both' => 'External tools defined/configured in either domain or course may be used',
+ 'used' => 'Use domain default',
+ 'cour' => 'Use course-specific setting',
+ 'curd' => 'Current domain default is',
+ 'valu' => 'Value for this course',
+ 'modi' => 'Save',
+ 'back' => 'Pick another action',
+ );
+ if ($type eq 'Community') {
+ $titles{'crs'} = &mt('Only external tools defined in community may be used');
+ $titles{'both'} = &mt('External tools defined/configured in either domain or community may be used');
+ $titles{'cour'} = &mt('Use community-specific setting');
+ $titles{'valu'} = &mt('Value for this community');
+ }
+ return %titles;
+}
+
sub modify_selfenrollconfig {
my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
@@ -1353,13 +1510,17 @@ sub modify_selfenrollconfig {
my $cdom = $coursehash->{'domain'};
my %currsettings = &get_selfenroll_settings($coursehash);
&print_header($r,$type);
- $r->print(''.&mt('Self-enrollment with a student role in: [_1]',
- ''.$cdesc.' ').' '."\n");
- $r->print('');
+ my @actions =
+ (''.
+ &mt('Pick another action').' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -1391,9 +1552,9 @@ sub modifiable_only_title {
my ($type) = @_;
my $dctitle = &Apache::lonnet::plaintext('dc');
if ($type eq 'Community') {
- return &mt('Community settings modifiable only by [_1] for:',$dctitle);
+ return &mt('Community settings modifiable only by [_1]',$dctitle);
} else {
- return &mt('Course settings modifiable only by [_1] for:',$dctitle);
+ return &mt('Course settings modifiable only by [_1]',$dctitle);
}
}
@@ -1777,8 +1938,8 @@ sub modify_course {
$reply = $chgresponse.$nochgresponse.$warning;
}
&print_header($r,$type);
- my $mainheader = &modifiable_only_title($type);
- $reply = ''.$mainheader.' '.$cdesc.' '."\n".
+ $reply = ''.&modifiable_only_title($type).' '."\n".
+ ''.&mt($type).': '.$cdesc.' '."\n".
''.$reply.'
'."\n".
'';
+ $reply .= ''.
+ ' '.&Apache::lonhtmlcommon::actionbox(\@actions);
$r->print($reply);
return;
}
@@ -1962,10 +2124,9 @@ sub modify_quota {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
my $lctype = lc($type);
- my $headline = &mt("Disk space quotas for $lctype: [_1]",
- ''.$cdesc.' ');
- $r->print('');
+ my @actions =
+ (''.
+ &mt('Pick another action').' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
sub modify_anonsurvey_threshold {
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
&print_header($r,$type);
- $r->print('');
+ my @actions =
+ (''.
+ &mt('Pick another action').' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2138,10 +2301,11 @@ sub modify_postsubmit_config {
unch => 'Post submission behavior of the Submit button is unchanged.',
erro => 'An error occurred when saving your proposed changes.',
inva => 'An invalid response was recorded.',
- pick => 'Pick another action',
+ back => 'Pick another action',
);
- $r->print('');
+ $r->print(''.&hidden_form_elements().'');
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2219,9 +2384,9 @@ sub modify_catsettings {
$desc{'categories'} = &mt('Assigned categories for this course');
$ccrole = 'cc';
}
- $r->print('
-');
+ $r->print(' '.&hidden_form_elements().'');
+ my @actions =
+ (''.
+ &mt('Pick another action').' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2355,9 +2521,9 @@ sub modify_ltiauth {
'back' => 'Pick another action',
);
&print_header($r,$type);
- $r->print('');
+ $r->print(' '.$status.''.
+ &hidden_form_elements().'');
+ my @actions =
+ (''.
+ $lt{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
+ return;
+}
+
+sub modify_exttool {
+ my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+ my %titles = &exttool_titles($type);
+ &print_header($r,$type);
+ $r->print(''.$titles{'extt'}.' '."\n".
+ ''.$type.': '.$cdesc.' '."\n".
+ '');
+ my @actions =
+ (''.
+ $titles{'back'}.' ');
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
return;
}
@@ -2484,9 +2760,10 @@ ENDJS
$js .= <<"ENDSCRIPT";
function verify_quota() {
- var newquota = document.setquota.coursequota.value;
+ var newcoursequota = document.setquota.coursequota.value;
+ var newuploadquota = document.setquota.uploadquota.value;
var num_reg = $regexp;
- if (num_reg.test(newquota)) {
+ if ((num_reg.test(newcoursequota)) && (num_reg.test(newuploadquota))) {
changePage(document.setquota,'processquota');
} else {
alert("$invalid\\n$alert");
@@ -2630,6 +2907,35 @@ function toggleLTIOptions(form) {
}
ENDJS
+ } elsif ($phase eq 'setexttool') {
+ $js .= <<"ENDJS";
+function toggleExtToolOptions(form) {
+ var radioname = 'exttoolset';
+ var divid = 'crsexttool';
+ var num = form.elements[radioname].length;
+ if (num) {
+ var setvis = '';
+ for (var i=0; i {'onload' => "toggleLTIOptions(document.setltiauth);"},
};
+ } elsif ($env{'form.phase'} eq 'setexttool') {
+ $starthash = {
+ add_entries => {'onload' => "toggleExtToolOptions(document.setexttool);"},
+ };
}
$r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
&Apache::lonhtmlcommon::scripttag($js),
@@ -2656,7 +2966,15 @@ ENDJS
} else {
$bread_text = 'Course Settings';
}
- $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
+ my $helpcomponent;
+ if ($env{'form.phase'} eq 'menu') {
+ if ($type eq 'Community') {
+ $helpcomponent = 'Domain_Modify_Community';
+ } else {
+ $helpcomponent = 'Domain_Modify_Course';
+ }
+ }
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,$helpcomponent));
return;
}
@@ -2743,8 +3061,8 @@ sub hidden_form_elements {
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset'],
- ['^selfenrollmgr_','^selfenroll_'])."\n".
+ 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset',
+ 'exttoolset','exttool'],['^selfenrollmgr_','^selfenroll_'])."\n".
' ';
return $hidden_elements;
}
@@ -2779,6 +3097,8 @@ sub get_permission {
adhocrole => 'coord',
setltiauth => 'edit',
processltiauth => 'edit',
+ setexttool => 'edit',
+ processexttool => 'edit',
);
if ($passwdconf{'crsownerchg'}) {
$permission{passwdchg} = 'edit';
@@ -2795,6 +3115,7 @@ sub get_permission {
selfenroll => 'view',
adhocrole => 'custom',
setltiauth => 'view',
+ setexttool => 'view',
);
if ($passwdconf{'crsownerchg'}) {
$permission{passwdchg} = 'view';
@@ -3006,11 +3327,22 @@ sub handler {
} elsif (($phase eq 'processltiauth') && ($permission->{'processltiauth'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setltiauth')",
- text=>"Requirement for re-authentication for LTI launch of deep-linked item"});
+ text=>"Requirement for re-authentication for LTI launch of deep-linked item"},
+ {href=>"javascript:changePage(document.$phase,'$phase')",
+ text=>"Result"});
+ &modify_ltiauth($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+ } elsif (($phase eq 'setexttool') && ($permission->{'setexttool'})) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
+ text=>"External Tool permission"});
+ &print_set_exttool($r,$cdom,$cnum,$cdesc,$type,$readonly);
+ } elsif (($phase eq 'processexttool') && ($permission->{'processexttool'})) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:changePage(document.$phase,'setexttool')",
+ text=>"External Tool permission"},
+ {href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
- &modify_ltiauth($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+ &modify_exttool($r,$cdom,$cnum,$cdesc,$domdesc,$type);
}
}
} else {