--- loncom/interface/lonmodifycourse.pm 2023/07/05 18:57:55 1.79.2.9.2.3
+++ loncom/interface/lonmodifycourse.pm 2022/02/16 02:20:59 1.98
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.79.2.9.2.3 2023/07/05 18:57:55 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.98 2022/02/16 02:20:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -79,6 +79,13 @@ sub catalog_settable {
if ($confhash->{'categorizecomm'} ne 'comm') {
push(@settable,'categorize');
}
+ } elsif ($type eq 'Placement') {
+ if ($confhash->{'togglecatsplace'} ne 'place') {
+ push(@settable,'togglecats');
+ }
+ if ($confhash->{'categorizeplace'} ne 'place') {
+ push(@settable,'categorize');
+ }
} else {
if ($confhash->{'togglecats'} ne 'crs') {
push(@settable,'togglecats');
@@ -175,6 +182,8 @@ sub print_course_search_page {
$r->print(&Apache::loncommon::js_changer());
if ($type eq 'Community') {
$r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
+ } elsif ($type eq 'Placement') {
+ $r->print('<h3>'.&mt('Search for a placement test in the [_1] domain',$domdesc).'</h3>');
} else {
$r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
}
@@ -185,6 +194,8 @@ sub print_course_search_page {
my ($actiontext,$roleoption,$settingsoption);
if ($type eq 'Community') {
$actiontext = &mt('Actions available after searching for a community:');
+ } elsif ($type eq 'Placement') {
+ $actiontext = &mt('Actions available after searching for a placement test:')
} else {
$actiontext = &mt('Actions available after searching for a course:');
}
@@ -192,6 +203,9 @@ sub print_course_search_page {
if ($type eq 'Community') {
$roleoption = &mt('Enter the community with the role of [_1]',$cctitle);
$settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle);
+ $settingsoption = &mt('View or modify placement test settings which only a [_1] may modify.',$dctitle);
} else {
$roleoption = &mt('Enter the course with the role of [_1]',$cctitle);
$settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle);
@@ -202,6 +216,8 @@ sub print_course_search_page {
if (@{$roles_by_num} > 1) {
if ($type eq 'Community') {
$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.');
} else {
$roleoption = &mt('Enter the course with one of the available ad hoc roles.');
}
@@ -209,6 +225,8 @@ sub print_course_search_page {
my $rolename = $description->{$roles_by_num->[0]};
if ($type eq 'Community') {
$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]',$rolename);
} else {
$roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
}
@@ -216,6 +234,8 @@ sub print_course_search_page {
}
if ($type eq 'Community') {
$settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle);
} else {
$settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
}
@@ -411,7 +431,6 @@ 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 = (
@@ -420,11 +439,10 @@ 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') {
+ if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Community Settings';
$linktext{'setparms'} = 'View/Modify community owner';
$linktext{'catsettings'} = 'View/Modify catalog settings for community';
@@ -434,7 +452,7 @@ sub print_modification_menu {
$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.');
- $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
+ $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
} else {
if ($permission->{'setparms'} eq 'edit') {
$categorytitle = 'View/Modify Course Settings';
@@ -459,8 +477,7 @@ sub print_modification_menu {
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 $exttool_text = &mt('Override default permissions for external tools use for this specific course.');
+ my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item');
$linktext{'viewparms'} = 'Display current settings for automated enrollment';
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
@@ -521,7 +538,7 @@ sub print_modification_menu {
{
linktext => $linktext{'viewparms'},
url => &phaseurl('viewparms'),
- permission => ($permission->{'viewparms'} && ($type ne 'Community')),
+ permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')),
#help => '',
icon => 'roles.png',
linktitle => ''
@@ -550,14 +567,6 @@ sub print_modification_menu {
permission => $permission->{'setltiauth'},
linktitle => '',
},
- {
- linktext => $linktext{'setexttool'},
- icon => 'exttool.png',
- #help => '',
- url => &phaseurl('setexttool'),
- permission => $permission->{'setexttool'},
- linktitle => '',
- },
]
},
);
@@ -579,7 +588,7 @@ sub print_modification_menu {
} else {
$menu_html .= '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n".
'<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>'."\n";
- if (&showcredits($dom)) {
+ if (($type ne 'Placement') && &showcredits($dom)) {
$menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>'."\n";
}
$menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
@@ -589,8 +598,7 @@ sub print_modification_menu {
'<li>'.$setuploadquota_text.'</li>'."\n".
'<li>'.$anon_text.'</li>'."\n".
'<li>'.$postsubmit_text.'</li>'."\n".
- '<li>'.$ltiauth_text.'</li>'."\n".
- '<li>'.$exttool_text.'</li>'."\n";
+ '<li>'.$ltiauth_text.'</li>'."\n";
my ($categories_link_start,$categories_link_end);
if ($permission->{'catsettings'} eq 'edit') {
$categories_link_start = '<a href="/adm/domainprefs?actions=coursecategories&phase=display">';
@@ -636,9 +644,9 @@ sub print_adhocrole_selected {
}
$selectrole = 1;
} elsif ($permission->{'adhocrole'} eq 'custom') {
- my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
+ my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
if (ref($okroles) eq 'ARRAY') {
- my $possrole = $env{'form.adhocrole'};
+ 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";
@@ -843,7 +851,7 @@ sub print_set_anonsurvey_threshold {
my $hidden_elements = &hidden_form_elements();
my ($disabled,$submit);
if ($readonly) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
} else {
$submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
}
@@ -936,7 +944,15 @@ ENDDOCUMENT
sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
return unless (ref($settings) eq 'HASH');
- my $lctype = &get_lctype($type,$settings);
+ 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 %domconfig =
&Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
my $postsubtimeout = 60;
@@ -952,22 +968,6 @@ sub domain_postsubtimeout {
return $postsubtimeout;
}
-sub get_lctype {
- my ($type,$settings) = @_;
- my $lctype = lc($type);
- unless ($type eq 'Community') {
- $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);
@@ -1008,6 +1008,8 @@ sub print_catsettings {
' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label><br /><p>');
if ($type eq 'Community') {
$r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
} else {
$r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':<ul>'.
'<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'.
@@ -1029,7 +1031,7 @@ sub print_catsettings {
} else {
$r->print(&mt('No categories defined for this domain'));
}
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
$r->print('<p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
}
}
@@ -1129,7 +1131,7 @@ sub print_course_modification_page {
foreach my $cc (@local_ccs) {
$ownertable .= &Apache::loncommon::start_data_table_row()."\n";
if ($cc eq $enrollvar{'courseowner'}) {
- $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked"'.$disabled.' /></td>'."\n";
} else {
$ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
}
@@ -1159,7 +1161,7 @@ sub print_course_modification_page {
' '.&mt('Course Code'))."\n".
'<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.' />'.
&Apache::lonhtmlcommon::row_closure());
- if (&showcredits($cdom)) {
+ if (($crstype eq 'Course') && (&showcredits($cdom))) {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Credithours').
' '.&mt('Credits (students)'))."\n".
@@ -1286,10 +1288,10 @@ sub print_set_ltiauth {
);
my ($domdef,$checkeddom,$checkedcrs,$domdefdisplay,$divsty,$authok,$authno);
$domdef = 0;
- $checkeddom = ' checked="checked"';
- $domdefdisplay = $lt{'logi'};
+ $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') {
@@ -1306,7 +1308,7 @@ sub print_set_ltiauth {
$checkeddom = '';
$divsty = 'display:inline-block';
if ($ltiauth) {
- $authok = ' checked="checked"';
+ $authok = 'checked="checked "';
}
}
&print_header($r,$type);
@@ -1323,16 +1325,16 @@ sub print_set_ltiauth {
<h3>$helpitem $lt{'requ'} <span class="LC_nobreak">$cdesc</span></h3>
<p><span class="LC_nobreak">$lt{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span</p>
<p><span class="LC_nobreak">
-<label><input type="radio" name="ltiauthset" value="dom" onclick="toggleLTIOptions(this.form);"$checkeddom$disabled />$lt{'used'}</label></span><br />
+<label><input type="radio" name="ltiauthset" value="dom" onclick="toggleLTIOptions(this.form);" $checkeddom$disabled/>$lt{'used'}</label></span><br />
<span class="LC_nobreak">
-<label><input type="radio" name="ltiauthset" value="course" onclick="toggleLTIOptions(this.form);"$checkedcrs$disabled />$lt{'cour'}</label></span>
+<label><input type="radio" name="ltiauthset" value="course" onclick="toggleLTIOptions(this.form);" $checkedcrs$disabled/>$lt{'cour'}</label></span>
<fieldset id="crsltiauth" style="$divsty">
<legend>$lt{'valu'}</legend>
<span class="LC_nobreak">
-<label><input type="radio" name="ltiauth" value="0"$authno$disabled />$lt{'logi'}</label>
+<label><input type="radio" name="ltiauth" value="0" $authno$disabled/>$lt{'logi'}</label>
</span><br />
<span class="LC_nobreak">
-<label><input type="radio" name="ltiauth" value="1"$authok$disabled />$lt{'link'}</label>
+<label><input type="radio" name="ltiauth" value="1" $authok$disabled/>$lt{'link'}</label>
</span>
</fieldset>
$submit
@@ -1344,126 +1346,6 @@ ENDDOCUMENT
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 = '<input type="button" onclick="javascript:changePage(this.form,'."'processexttool'".');" value="'.$titles{'modi'}.'" />';
- }
- my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_External_Tool');
- $r->print(<<ENDDOCUMENT);
-<form action="/adm/modifycourse" method="post" name="setexttool">
-<h3>$helpitem $titles{'extt'}</h3>
-<h4><span class="LC_nobreak">$type: $cdesc</span></h4>
-<p><span class="LC_nobreak">$titles{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span</p>
-<p><span class="LC_nobreak">
-<label><input type="radio" name="exttoolset" value="dom" onclick="toggleExtToolOptions(this.form);"$checkeddom$disabled />$titles{'used'}</label></span><br />
-<span class="LC_nobreak">
-<label><input type="radio" name="exttoolset" value="course" onclick="toggleExtToolOptions(this.form);"$checkedcrs$disabled />$titles{'cour'}</label></span>
-<fieldset id="crsexttool" style="$divsty">
-<legend>$titles{'valu'}</legend>
-<span class="LC_nobreak">
-<label><input type="radio" name="exttool" value="both"$crschecked{'both'}$disabled />$titles{'both'}</label>
-</span><br />
-<span class="LC_nobreak">
-<label><input type="radio" name="exttool" value="dom"$crschecked{'dom'}$disabled />$titles{'dom'}</label>
-</span><br />
-<span class="LC_nobreak">
-<label><input type="radio" name="exttool" value="crs"$crschecked{'crs'}$disabled />$titles{'crs'}</label>
-</span><br />
-<span class="LC_nobreak">
-<label><input type="radio" name="exttool" value="none"$crschecked{'none'}$disabled />$titles{'none'}</label>
-</span>
-</fieldset><br />
-$submit
-</p>
-$hidden_elements
-<a href="javascript:changePage(document.setexttool,'menu')">$titles{'back'}</a>
-</form>
-ENDDOCUMENT
- 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');
@@ -1565,7 +1447,7 @@ sub modify_course {
'internal.pendingco-owners','internal.selfenrollmgrdc',
'internal.selfenrollmgrcc','internal.mysqltables');
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
'internal.sectionnums','internal.crosslistings'));
if (&showcredits($cdom)) {
@@ -1800,7 +1682,7 @@ sub modify_course {
$nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
}
- if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
+ if (($type ne 'Community') && ($type ne 'Placement') && ($changed{'code'} || $changed{'owner'})) {
if ( $newattr{'courseowner'} eq '') {
push(@warnings,&mt('There is no owner associated with this LON-CAPA course.').
'<br />'.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
@@ -2492,7 +2374,7 @@ sub modify_ltiauth {
$change = 1;
}
} elsif ($env{'form.ltiauthset'} eq 'course') {
- if ($env{'form.ltiauth'} =~ /^0|1$/) {
+ if ($env{'form.ltiauth'} =~ /^0|1$/) {
$newltiauth = $env{'form.ltiauth'};
}
if ($oldltiauth == $newltiauth) {
@@ -2559,115 +2441,7 @@ sub modify_ltiauth {
$r->print('<br />'.$status);
$r->print('</p><p>'.
'<a href="javascript:changePage(document.processltiauth,'."'menu'".')">'.
- $lt{'back'}.'</a></p>');
- $r->print(&hidden_form_elements().'</form>');
- return;
-}
-
-sub modify_exttool {
- my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
- my %titles = &exttool_titles($type);
- &print_header($r,$type);
- $r->print('<form action="/adm/modifycourse" method="post" name="processexttool">'."\n".
- '<h3>'.$titles{'extt'}.'</h3>'.
- '<h4><span class="LC_nobreak">'.$type.': '.$cdesc.'</span></h4>');
- my %oldsettings = &Apache::lonnet::get('environment',['internal.exttool'],$cdom,$cnum);
- my $oldcrsexttool = $oldsettings{'internal.exttool'};
- my $domdefdom = 1;
- my $domdef = 0;
- my $domdefdisplay;
- 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'}{'domexttool'}) eq 'HASH') {
- if (exists($domconfig{'coursedefaults'}{'domexttool'}{$lctype})) {
- $domdefdom = $domconfig{'coursedefaults'}{'domexttool'}{$lctype};
- }
- }
- if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') {
- if (exists($domconfig{'coursedefaults'}{'exttool'}{$lctype})) {
- $domdef = $domconfig{'coursedefaults'}{'exttool'}{$lctype};
- }
- }
- }
- if ($domdef && $domdefdom) {
- $domdefdisplay = $titles{'both'};
- } elsif ($domdef) {
- $domdefdisplay = $titles{'crs'};
- } elsif ($domdefdom) {
- $domdefdisplay = $titles{'dom'};
- } else {
- $domdefdisplay = $titles{'none'};
- }
- my ($newcrsexttool,$nochange,$change,$status,$error,$exttool);
- if ($env{'form.exttoolset'} eq 'dom') {
- if ($oldcrsexttool eq '') {
- $nochange = 1;
- } else {
- $change = 1;
- }
- } elsif ($env{'form.exttoolset'} eq 'course') {
- if ($env{'form.exttool'} =~ /^both|dom|crs|none$/) {
- $newcrsexttool = $env{'form.exttool'};
- }
- if ($oldcrsexttool eq $newcrsexttool) {
- $nochange = 1;
- } else {
- $change = 1;
- }
- }
- if ($change) {
- if ($newcrsexttool ne '') {
- my %cenv = (
- 'internal.exttool' => $newcrsexttool,
- );
- if (&Apache::lonnet::put('environment',\%cenv,$cdom,$cnum) eq 'ok') {
- if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
- &Apache::lonnet::appenv(
- {'course.'.$cdom.'_'.$cnum.'.internal.exttool' => $newcrsexttool});
- }
- } else {
- $error = 1;
- }
- } else {
- if (&Apache::lonnet::del('environment',['internal.exttool'],$cdom,$cnum) eq 'ok') {
- if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.exttool'})) {
- &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.internal.exttool');
- }
- } else {
- $error = 1;
- }
- }
- }
- if ($error) {
- $nochange = 1;
- }
- if ($nochange) {
- $exttool = $oldcrsexttool;
- } else {
- $exttool = $newcrsexttool;
- }
- if ($exttool eq '') {
- $status = $titles{'used'}.': <span style="font-style:italic">'.$domdefdisplay.'</span>';
- } else {
- $status = $titles{'cour'}.': <span style="font-style:italic">'.$titles{$exttool}.'</span>';
- }
- if ($error) {
- $r->print('<p class="LC_warning">'.&mt('An error occurred when saving your changes').'</p>');
- }
- $r->print('<p>');
- if ($nochange) {
- $r->print(&mt('External Tool permissions unchanged'));
- } elsif ($change) {
- $r->print(&mt('External Tool permissions changed'));
- }
- $r->print('<br />'.$status);
- $r->print('</p><p>'.
- '<a href="javascript:changePage(document.processexttool,'."'menu'".')">'.
- $titles{'back'}.'</a></p>');
+ &mt('Pick another action').'</a></p>');
$r->print(&hidden_form_elements().'</form>');
return;
}
@@ -2856,35 +2630,6 @@ 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<num; i++) {
- if (form.elements[radioname][i].checked) {
- if (form.elements[radioname][i].value == 'course') {
- if (document.getElementById(divid)) {
- document.getElementById(divid).style.display = 'inline-block';
- }
- setvis = 1;
- }
- break;
- }
- }
- if (!setvis) {
- if (document.getElementById(divid)) {
- document.getElementById(divid).style.display = 'none';
- }
- }
- }
- return;
-}
-
-ENDJS
}
my $starthash;
if ($env{'form.phase'} eq 'adhocrole') {
@@ -2899,10 +2644,6 @@ ENDJS
$starthash = {
add_entries => {'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),
@@ -2910,6 +2651,8 @@ ENDJS
my $bread_text = "View/Modify Courses/Communities";
if ($type eq 'Community') {
$bread_text = 'Community Settings';
+ } elsif ($type eq 'Placement') {
+ $bread_text = 'Placement Test Settings';
} else {
$bread_text = 'Course Settings';
}
@@ -3000,8 +2743,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',
- 'exttoolset','exttool'],['^selfenrollmgr_','^selfenroll_'])."\n".
+ 'sections','newsec','mysqltables','nopasswdchg','ltiauth','ltiauthset'],
+ ['^selfenrollmgr_','^selfenroll_'])."\n".
'<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
return $hidden_elements;
}
@@ -3036,8 +2779,6 @@ sub get_permission {
adhocrole => 'coord',
setltiauth => 'edit',
processltiauth => 'edit',
- setexttool => 'edit',
- processexttool => 'edit',
);
if ($passwdconf{'crsownerchg'}) {
$permission{passwdchg} = 'edit';
@@ -3054,7 +2795,6 @@ sub get_permission {
selfenroll => 'view',
adhocrole => 'custom',
setltiauth => 'view',
- setexttool => 'view',
);
if ($passwdconf{'crsownerchg'}) {
$permission{passwdchg} = 'view';
@@ -3120,6 +2860,8 @@ sub handler {
}
if ($type eq 'Community') {
$choose_text = "Choose a community";
+ } elsif ($type eq 'Placement') {
+ $choose_text = "Choose a placement test";
} else {
$choose_text = "Choose a course";
}
@@ -3136,6 +2878,8 @@ sub handler {
my $enter_text;
if ($type eq 'Community') {
$enter_text = 'Enter community';
+ } elsif ($type eq 'Placement') {
+ $enter_text = 'Enter placement test';
} else {
$enter_text = 'Enter course';
}
@@ -3158,11 +2902,11 @@ sub handler {
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
my ($readonly,$linktext);
if ($permission->{$phase} eq 'view') {
- $readonly = 1;
+ $readonly = 1;
}
if (($phase eq 'setquota') && ($permission->{'setquota'})) {
if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
+ $linktext = 'Set quota';
} else {
$linktext = 'Display quota';
}
@@ -3262,28 +3006,19 @@ 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"},
- {href=>"javascript:changePage(document.$phase,'$phase')",
- text=>"Result"});
- &modify_ltiauth($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'setexttool') && ($permission->{'setexttool'})) {
+ text=>"Requirement for re-authentication for LTI launch of deep-linked item"});
&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_exttool($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+ &modify_ltiauth($r,$cdom,$cnum,$cdesc,$domdesc,$type);
}
}
} else {
$r->print('<span class="LC_error">');
if ($type eq 'Community') {
$r->print(&mt('The community you selected is not a valid community in this domain'));
+ } elsif ($type eq 'Placement') {
+ $r->print(&mt('The course you selected is not a valid placement test in this domain'));
} else {
$r->print(&mt('The course you selected is not a valid course in this domain'));
}