--- loncom/interface/lonmodifycourse.pm 2017/01/22 19:23:35 1.79.2.5
+++ loncom/interface/lonmodifycourse.pm 2016/04/02 04:30:21 1.80
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.79.2.5 2017/01/22 19:23:35 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.80 2016/04/02 04:30:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,8 +44,7 @@ sub get_dc_settable {
if ($type eq 'Community') {
return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
} else {
- my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc',
- 'selfenrollmgrcc','mysqltables');
+ my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
if (&showcredits($cdom)) {
push(@items,'defaultcredits');
}
@@ -56,7 +55,7 @@ sub get_dc_settable {
sub autoenroll_keys {
my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
'autoadds','autodrops','autostart','autoend','sectionnums',
- 'crosslistings','co-owners','autodropfailsafe'];
+ 'crosslistings','co-owners'];
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
return ($internals,$accessdates);
}
@@ -118,13 +117,14 @@ sub get_enrollment_settings {
$enrollvar{$type} =~ s/,/, /g;
} elsif ($type eq "authtype"
|| $type eq "autharg" || $type eq "coursecode"
- || $type eq "crosslistings" || $type eq "selfenrollmgr"
- || $type eq "autodropfailsafe") {
+ || $type eq "crosslistings") {
$enrollvar{$type} = $settings{$item};
} elsif ($type eq 'defaultcredits') {
if (&showcredits($cdom)) {
$enrollvar{$type} = $settings{$item};
}
+ } elsif ($type eq 'selfenrollmgr') {
+ $enrollvar{$type} = $settings{$item};
} elsif ($type eq 'courseowner') {
if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
$enrollvar{$type} = $settings{$item};
@@ -173,179 +173,29 @@ sub print_course_search_page {
$r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
\$numtitles,'modifycourse',undef,undef,undef,
\@codetitles,$dom));
-
- my ($actiontext,$roleoption,$settingsoption);
if ($type eq 'Community') {
- $actiontext = &mt('Actions available after searching for a community:');
- } else {
- $actiontext = &mt('Actions available after searching for a course:');
- }
- if (&Apache::lonnet::allowed('ccc',$dom)) {
- 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);
- } 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);
- }
- } elsif (&Apache::lonnet::allowed('rar',$dom)) {
- 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');
- } else {
- $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]',$rolename);
- } else {
- $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename);
- }
- }
- }
- if ($type eq 'Community') {
- $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);
- } else {
- $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
- }
+ $r->print(&mt('Actions available after searching for a community:').'<ul>'.
+ '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
+ '<li>'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
+ '</li>'."\n".'</ul>');
+ } else {
+ $r->print(&mt('Actions available after searching for a course:').'<ul>'.
+ '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
+ '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
+ '</li>'."\n".'</ul>');
}
- $r->print($actiontext.'<ul>');
- if ($roleoption) {
- $r->print('<li>'.$roleoption.'</li>'."\n");
- }
- $r->print('<li>'.$settingsoption.'</li>'."\n".'</ul>');
return;
}
sub print_course_selection_page {
- my ($r,$dom,$domdesc,$permission) = @_;
+ my ($r,$dom,$domdesc) = @_;
my $type = $env{'form.type'};
if (!defined($type)) {
$type = 'Course';
}
&print_header($r,$type);
- 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");
-<script type="text/javascript">
-// <![CDATA[
-\$(document).ready(function(){
- \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
-});
-
-function gochoose(cname,cdom,cdesc) {
- document.courselist.pickedcourse.value = cdom+'_'+cname;
- \$("#LC_choose_adhoc").empty();
- var pickedaction = \$('input[name=phase]:checked', '#LCcoursepicker').val();
- if (pickedaction == 'adhocrole') {
- var http = new XMLHttpRequest();
- var url = "/adm/pickcourse";
- var params = "cid="+cdom+"_"+cname+"&context=adhoc";
- http.open("POST", url, true);
- http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
- http.onreadystatechange = function() {
- if (http.readyState == 4 && http.status == 200) {
- var data = \$.parseJSON(http.responseText);
- var len = data.roles.length;
- if (len == '' || len == null || len == 0) {
- alert('$jslt{none}');
- } else {
- if (len == 1) {
- \$( '[name="adhocrole"]' )[0].value = data.roles[0].name;
- document.courselist.submit();
- } else {
- var str = '';
- for (var i=0; i<data.roles.length; i++) {
- \$("<label><input type='radio' value='"+data.roles[i].name+"' name='LC_get_role' id='LC_get_role_"+i+"' />"+data.roles[i].desc+"</label><span> </span>")
- .appendTo("#LC_choose_adhoc");
- }
- \$( "#LC_get_role_0").prop("checked", true);
- \$( "#LC_adhocrole_chooser" ).dialog({ autoOpen: false });
- \$( "#LC_adhocrole_chooser" ).dialog("open");
- \$( "#LC_adhocrole_chooser" ).dialog({
- height: 400,
- width: 500,
- modal: true,
- resizable: false,
- buttons: [
- {
- text: "$jslt{'ok'}",
- click: function() {
- var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val();
- \$( '[name="adhocrole"]' )[0].value = rolename;
- document.courselist.submit();
- }
- },
- {
- text: "$jslt{'exit'}",
- click: function() {
- \$("#LC_adhocrole_chooser").dialog( "close" );
- }
- }
- ],
- });
- \$( "#LC_adhocrole_chooser" ).find( "form" ).on( "submit", function( event ) {
- event.preventDefault();
- var rolename = \$('input[name=LC_get_role]:checked', '#LChelpdeskpicker').val()
- \$( '[name="adhocrole"]' )[0].value = rolename;
- document.courselist.submit();
- \$("#LC_adhocrole_chooser").dialog( "close" );
- });
- }
- }
- }
- }
- http.send(params);
- } else {
- document.courselist.submit();
- }
- return;
-}
-// ]]>
-</script>
-
-<div id="LC_adhocrole_chooser" title="$lt{'title'}">
- <p>$lt{'preamble'}</p>
- <form name="LChelpdeskadhoc" id="LChelpdeskpicker" action="">
- <div id="LC_choose_adhoc">
- </div>
- <input type="hidden" name="adhocrole" id="LCadhocrole" value="" />
- <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
- </form>
- <p>$lt{'cancel'}</p>
-</div>
-END
- } elsif ($permission->{'adhocrole'} eq 'coord') {
- $r->print(<<"END");
-<script type="text/javascript">
-// <![CDATA[
-
-function gochoose(cname,cdom,cdesc) {
- document.courselist.pickedcourse.value = cdom+'_'+cname;
- document.courselist.submit();
- return;
-}
-
-// ]]>
-</script>
-END
- }
-
-# Criteria for course search
+# Criteria for course search
my ($filterlist,$filter) = &get_filters();
my $action = '/adm/modifycourse';
my $dctitle = &Apache::lonnet::plaintext('dc');
@@ -358,7 +208,7 @@ END
my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
undef,undef,undef,\@codetitles);
&Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
- $dom,undef,%courses);
+ undef,undef,%courses);
return;
}
@@ -379,9 +229,10 @@ sub get_filters {
}
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
+ my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
&print_header($r,$type);
- my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum);
+ my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
+ $cdom,$cnum);
if (ref($coursehash) eq 'HASH') {
$cdom = $coursehash->{'domain'};
$cnum = $coursehash->{'num'};
@@ -393,72 +244,36 @@ sub print_modification_menu {
} else {
$ccrole = 'cc';
}
- my %linktext;
- if ($permission->{'setparms'} eq 'edit') {
- %linktext = (
- 'setquota' => 'View/Modify quotas for group portfolio files, and for uploaded content',
- 'setanon' => 'View/Modify responders threshold for anonymous survey submissions display',
- 'selfenroll' => 'View/Modify Self-Enrollment configuration',
- 'setpostsubmit' => 'View/Modify submit button behavior, post-submission',
- );
- } else {
- %linktext = (
- 'setquota' => 'View quotas for group portfolio files, and for uploaded content',
- 'setanon' => 'View responders threshold for anonymous survey submissions display',
- 'selfenroll' => 'View Self-Enrollment configuration',
- 'setpostsubmit' => 'View submit button behavior, post-submission',
- );
- }
if ($type eq 'Community') {
- if ($permission->{'setparms'} eq 'edit') {
- $categorytitle = 'View/Modify Community Settings';
- $linktext{'setparms'} = 'View/Modify community owner';
- $linktext{'catsettings'} = 'View/Modify catalog settings for community';
- } else {
- $categorytitle = 'View Community Settings';
- $linktext{'setparms'} = 'View community owner';
- $linktext{'catsettings'} = 'View catalog settings for community';
- }
+ $categorytitle = 'View/Modify Community Settings';
$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.');
+ $setparams_text = 'View/Modify community owner';
+ $cat_text = 'View/Modify catalog settings for community';
} else {
- if ($permission->{'setparms'} eq 'edit') {
- $categorytitle = 'View/Modify Course Settings';
- $linktext{'catsettings'} = 'View/Modify catalog settings for course';
- if (($type ne 'Placement') && (&showcredits($dom))) {
- $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
- } else {
- $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime';
- }
- } else {
- $categorytitle = 'View Course Settings';
- $linktext{'catsettings'} = 'View catalog settings for course';
- if (($type ne 'Placement') && (&showcredits($dom))) {
- $linktext{'setparms'} = 'View course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
- } else {
- $linktext{'setparms'} = 'View course owner, institutional code, default authentication, self-enrollment and table lifetime';
- }
- }
+ $categorytitle = 'View/Modify Course Settings';
$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.');
+ if (&showcredits($dom)) {
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
+ } else {
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
+ }
+ $cat_text = 'View/Modify catalog settings for course';
}
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.');
- $linktext{'viewparms'} = 'Display current settings for automated enrollment';
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
sub manage_selfenrollment {
- my ($cdom,$cnum,$type,$coursehash,$permission) = @_;
- if ($permission->{'selfenroll'}) {
- my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
- if (ref($managed_by_dc) eq 'ARRAY') {
- if (@{$managed_by_dc}) {
- return 1;
- }
- }
+ my ($cdom,$cnum,$type,$coursehash) = @_;
+ my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
+ if (ref($managed_by_dc) eq 'ARRAY') {
+ if (@{$managed_by_dc}) {
+ return 1;
+ }
}
return 0;
}
@@ -471,59 +286,59 @@ sub print_modification_menu {
({ categorytitle => $categorytitle,
items => [
{
- linktext => $linktext{'setparms'},
+ linktext => $setparams_text,
url => &phaseurl('setparms'),
- permission => $permission->{'setparms'},
+ permission => 1,
#help => '',
icon => 'crsconf.png',
linktitle => ''
},
{
- linktext => $linktext{'setquota'},
+ linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
url => &phaseurl('setquota'),
- permission => $permission->{'setquota'},
+ permission => 1,
#help => '',
icon => 'groupportfolioquota.png',
linktitle => ''
},
{
- linktext => $linktext{'setanon'},
+ linktext => 'View/Modify responders threshold for anonymous survey submissions display',
url => &phaseurl('setanon'),
- permission => $permission->{'setanon'},
+ permission => 1,
#help => '',
icon => 'anonsurveythreshold.png',
linktitle => ''
},
{
- linktext => $linktext{'catsettings'},
+ linktext => $cat_text,
url => &phaseurl('catsettings'),
- permission => (($permission->{'catsettings'}) && (@additional_params > 0)),
+ permission => (@additional_params > 0),
#help => '',
icon => 'ccatconf.png',
linktitle => ''
},
{
- linktext => $linktext{'viewparms'},
+ linktext => 'Display current settings for automated enrollment',
url => &phaseurl('viewparms'),
- permission => ($permission->{'viewparms'} && ($type ne 'Community')),
+ permission => ($type ne 'Community'),
#help => '',
icon => 'roles.png',
linktitle => ''
},
{
- linktext => $linktext{'selfenroll'},
+ linktext => 'View/Modify Self-Enrollment configuration',
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => &phaseurl('selfenroll'),
- permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission),
+ permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
linktitle => 'Configure user self-enrollment.',
},
{
- linktext => $linktext{'setpostsubmit'},
+ linktext => 'View/Modify submit button behavior, post-submission',
icon => 'emblem-readonly.png',
#help => '',
url => &phaseurl('setpostsubmit'),
- permission => $permission->{'setpostsubmit'},
+ permission => 1,
linktitle => '',
},
]
@@ -552,28 +367,22 @@ sub print_modification_menu {
}
$menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
}
- $menu_html .= '<li>'.$mysqltables_text.'</li>'."\n".
- '<li>'.$setquota_text.'</li>'."\n".
+ $menu_html .= '<li>'.$setquota_text.'</li>'."\n".
'<li>'.$setuploadquota_text.'</li>'."\n".
'<li>'.$anon_text.'</li>'."\n".
'<li>'.$postsubmit_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">';
- $categories_link_end = '</a>';
- }
foreach my $item (@additional_params) {
if ($type eq 'Community') {
if ($item eq 'togglecats') {
- $menu_html .= ' <li>'.&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).'</li>'."\n";
+ $menu_html .= ' <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
} elsif ($item eq 'categorize') {
- $menu_html .= ' <li>'.&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).'</li>'."\n";
+ $menu_html .= ' <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
}
} else {
if ($item eq 'togglecats') {
- $menu_html .= ' <li>'.&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).'</li>'."\n";
+ $menu_html .= ' <li>'.&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).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
} elsif ($item eq 'categorize') {
- $menu_html .= ' <li>'.&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).'</li>'."\n";
+ $menu_html .= ' <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
}
}
}
@@ -589,43 +398,18 @@ sub print_modification_menu {
return;
}
-sub print_adhocrole_selected {
- my ($r,$type,$permission) = @_;
+sub print_ccrole_selected {
+ my ($r,$type) = @_;
&print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- my ($newrole,$selectrole);
- if ($permission->{'adhocrole'} eq 'coord') {
- if ($type eq 'Community') {
- $newrole = "co./$cdom/$cnum";
- } else {
- $newrole = "cc./$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;
- }
- }
- }
- if ($selectrole) {
- $r->print('<form name="adhocrole" method="post" action="/adm/roles">
-<input type="hidden" name="selectrole" value="'.$selectrole.'" />
-<input type="hidden" name="newrole" value="'.$newrole.'" />
+ $r->print('<form name="ccrole" method="post" action="/adm/roles">
+<input type="hidden" name="selectrole" value="1" />
+<input type="hidden" name="newrole" value="cc./'.$cdom.'/'.$cnum.'" />
</form>');
- } else {
- $r->print('<form name="ccrole" method="post" action="/adm/modifycourse">'.
- '</form>');
- }
- return;
}
sub print_settings_display {
- my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %longtype = &course_settings_descrip($type);
my %lt = &Apache::lonlocal::texthash(
@@ -666,39 +450,29 @@ sub print_settings_display {
}
$disp_table .= &Apache::loncommon::end_data_table()."\n";
&print_header($r,$type);
- my ($enroll_link_start,$enroll_link_end,$setparms_link_start,$setparms_link_end);
- if (&Apache::lonnet::allowed('ccc',$cdom)) {
- my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
- my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
- '=1&destinationurl=/adm/populate','&<>"');
- $enroll_link_start = '<a href="'.$escuri.'">';
- $enroll_link_end = '</a>';
- }
- if ($permission->{'setparms'}) {
- $setparms_link_start = '<a href="javascript:changePage(document.viewparms,'."'setparms'".');">';
- $setparms_link_end = '</a>';
- }
+ my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+ my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+ '=1&destinationurl=/adm/populate','&<>"');
$r->print('<h3>'.&mt('Current automated enrollment settings for:').
' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.
'<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".
'<p>'.$lt{'cose'}.'<ul>'.
- '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',
- $cctitle,$enroll_link_start,$enroll_link_end).'</li>');
+ '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>');
if (&showcredits($cdom)) {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
} else {
- $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+ $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
}
$r->print('</li></ul></p>'.
'<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
'<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
&hidden_form_elements().
'</p></form>'
- );
+ );
}
sub print_setquota {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my $lctype = lc($type);
my $headline = &mt("Set disk space quotas for $lctype: [_1]",
'<span class="LC_nobreak">'.$cdesc.'</span>');
@@ -731,25 +505,19 @@ sub print_setquota {
my $hidden_elements = &hidden_form_elements();
my $porthelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota');
my $uploadhelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Upload_Quota');
- my ($disabled,$submit);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
- }
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setquota" onsubmit="return verify_quota();">
<h3>$headline</h3>
<p><span class="LC_nobreak">
-$porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" $disabled /> MB
+$porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> MB
</span>
<br />
<span class="LC_nobreak">
-$uploadhelpitem $lt{'upqu'}: <input type="text" size="4" name="uploadquota" value="$uploadquota" $disabled /> MB
+$uploadhelpitem $lt{'upqu'}: <input type="text" size="4" name="uploadquota" value="$uploadquota" /> MB
</span>
</p>
<p>
-$submit
+<input type="submit" value="$lt{'modi'}" />
</p>
$hidden_elements
<a href="javascript:changePage(document.setquota,'menu')">$lt{'back'}</a>
@@ -759,7 +527,7 @@ ENDDOCUMENT
}
sub print_set_anonsurvey_threshold {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %lt = &Apache::lonlocal::texthash(
'resp' => 'Responder threshold for anonymous survey submissions display:',
'sufa' => 'Anonymous survey submissions displayed when responders exceeds',
@@ -782,19 +550,13 @@ sub print_set_anonsurvey_threshold {
}
&print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
- my ($disabled,$submit);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
- }
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setanon" onsubmit="return verify_anon_threshold();">
<h3>$lt{'resp'} <span class="LC_nobreak">$cdesc</span></h3>
<p>
-$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" $disabled />
-$submit
+$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" />
+<input type="submit" value="$lt{'modi'}" />
</p>
$hidden_elements
<a href="javascript:changePage(document.setanon,'menu')">$lt{'back'}</a>
@@ -804,7 +566,7 @@ ENDDOCUMENT
}
sub print_postsubmit_config {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
my %lt = &Apache::lonlocal::texthash (
'conf' => 'Configure submit button behavior after student makes a submission',
'disa' => 'Disable submit button/keypress following student submission',
@@ -845,27 +607,21 @@ sub print_postsubmit_config {
}
&print_header($r,$type);
my $hidden_elements = &hidden_form_elements();
- my ($disabled,$submit);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- } else {
- $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
- }
my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
$r->print(<<ENDDOCUMENT);
<form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
<h3>$lt{'conf'} <span class="LC_nobreak">($cdesc)</span></h3>
<p>
$helpitem $lt{'disa'}:
-<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" $disabled />
+<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" />
$lt{'yes'}</label>
-<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" $disabled />
+<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" />
$lt{'no'}</label>
<div id="studentsubmission" style="display: $display">
-$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" $disabled /><br />
+$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" /><br />
$zero</div>
<br />
-$submit
+<input type="submit" value="$lt{'modi'}" />
</p>
$hidden_elements
<a href="javascript:changePage(document.setpostsubmit,'menu')">$lt{'back'}</a>
@@ -878,7 +634,7 @@ sub domain_postsubtimeout {
my ($cdom,$type,$settings) = @_;
return unless (ref($settings) eq 'HASH');
my $lctype = lc($type);
- unless ($type eq 'Community') {
+ unless (($type eq 'Community') || ($type eq 'Placement')) {
$lctype = 'unofficial';
if ($settings->{'internal.coursecode'}) {
$lctype = 'official';
@@ -902,7 +658,7 @@ sub domain_postsubtimeout {
}
sub print_catsettings {
- my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
&print_header($r,$type);
my %lt = &Apache::lonlocal::texthash(
'back' => 'Pick another action',
@@ -923,10 +679,6 @@ sub print_catsettings {
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
if (@cat_params > 0) {
- my $disabled;
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- }
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
if (grep(/^togglecats$/,@cat_params)) {
@@ -938,7 +690,7 @@ sub print_catsettings {
}
$r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
$lt{'exclude'}.
- ' <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>');
+ ' <label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label> <label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&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."));
} else {
@@ -955,7 +707,7 @@ sub print_catsettings {
if (ref($cathash) eq 'HASH') {
$r->print($lt{'assi'}.'<br /><br />'.
&Apache::loncommon::assign_categories_table($cathash,
- $currsettings{'categories'},$type,$disabled));
+ $currsettings{'categories'},$type));
} else {
$r->print(&mt('No categories defined for this domain'));
}
@@ -966,10 +718,8 @@ sub print_catsettings {
$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>');
}
}
- unless ($readonly) {
- $r->print('<p><input type="button" name="chgcatsettings" value="'.
- &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
- }
+ $r->print('<p><input type="button" name="chgcatsettings" value="'.
+ &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
} else {
$r->print('<span class="LC_warning">');
if ($type eq 'Community') {
@@ -986,7 +736,7 @@ sub print_catsettings {
}
sub print_course_modification_page {
- my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$crstype) = @_;
my %lt=&Apache::lonlocal::texthash(
'actv' => "Active",
'inac' => "Inactive",
@@ -1000,11 +750,11 @@ sub print_course_modification_page {
'domd' => 'Domain default',
'whom' => 'Who configures',
);
- my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled);
+ my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
- 'internal.selfenrollmgrdc','internal.selfenrollmgrcc',
- 'internal.mysqltables'],$cdom,$cnum);
+ 'internal.selfenrollmgrdc','internal.selfenrollmgrcc'],
+ $cdom,$cnum);
my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'});
my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});
@@ -1015,12 +765,9 @@ sub print_course_modification_page {
$lt{'nocc'} = &mt('There is currently no owner set for this community.');
} else {
$ccrole ='cc';
- ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar,$readonly);
+ ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar);
}
$ccname = &Apache::lonnet::plaintext($ccrole,$crstype);
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- }
my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]);
my (@local_ccs,%cc_status,%pname);
foreach my $item (keys(%roleshash)) {
@@ -1061,9 +808,9 @@ 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" /></td>'."\n";
} else {
- $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
+ $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" /></td>'."\n";
}
$ownertable .=
'<td>'.$pname{$cc}.'</td>'."\n".
@@ -1088,23 +835,23 @@ sub print_course_modification_page {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Instcode').
' '.&mt('Course Code'))."\n".
- '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'"'.$disabled.' />'.
+ '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
&Apache::lonhtmlcommon::row_closure());
if (&showcredits($cdom)) {
$r->print(&Apache::lonhtmlcommon::row_title(
&Apache::loncommon::help_open_topic('Modify_Course_Credithours').
' '.&mt('Credits (students)'))."\n".
- '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'"'.$disabled.' />'.
+ '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'" />'.
&Apache::lonhtmlcommon::row_closure());
- }
- $r->print(&Apache::lonhtmlcommon::row_title(
- &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
- ' '.&mt('Default Authentication method'))."\n".
- $authenitems."\n".
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(
- &Apache::loncommon::help_open_topic('Modify_Course_Owner').
- ' '.&mt('Course Owner'))."\n");
+ }
+ $r->print(&Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
+ ' '.&mt('Default Authentication method'))."\n".
+ $authenitems."\n".
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(
+ &Apache::loncommon::help_open_topic('Modify_Course_Owner').
+ ' '.&mt('Course Owner'))."\n");
}
my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked);
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
@@ -1148,35 +895,27 @@ sub print_course_modification_page {
foreach my $option ('','0','1') {
$r->print('<span class="LC_nobreak"><label>'.
'<input type="radio" name="selfenrollmgr_'.$item.'" '.
- 'value="'.$option.'"'.$checked{$option}.$disabled.' />'.
+ 'value="'.$option.'"'.$checked{$option}.' />'.
$optionname{$option}.'</label></span><br />');
}
$r->print('</td>'."\n".
&Apache::loncommon::end_data_table_row()."\n");
}
$r->print(&Apache::loncommon::end_data_table()."\n".
- '<br />'.&Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(
- &Apache::loncommon::help_open_topic('Modify_Course_Table_Lifetime').
- ' '.&mt('"Temporary" Tables Lifetime (s)'))."\n".
- '<input type="text" size="10" name="mysqltables" value="'.$settings{'internal.mysqltables'}.'"'.$disabled.' />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements);
- unless ($readonly) {
- $r->print('<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
- if ($crstype eq 'Community') {
- $r->print('this.form.submit();"');
- } else {
- $r->print('javascript:verify_message(this.form);"');
- }
- $r->print(' value="'.$lt{'gobt'}.'" />');
+ '<br />'.&Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements.
+ '<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
+ if ($crstype eq 'Community') {
+ $r->print('this.form.submit();"');
+ } else {
+ $r->print('javascript:verify_message(this.form);"');
}
- $r->print('</p></form>');
+ $r->print(' value="'.$lt{'gobt'}.'" /></p></form>');
return;
}
sub print_selfenrollconfig {
- my ($r,$type,$cdesc,$coursehash,$readonly) = @_;
+ my ($r,$type,$cdesc,$coursehash) = @_;
return unless(ref($coursehash) eq 'HASH');
my $cnum = $coursehash->{'num'};
my $cdom = $coursehash->{'domain'};
@@ -1186,7 +925,7 @@ sub print_selfenrollconfig {
'<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
&Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
$cdom,$cnum,\%currsettings,
- &hidden_form_elements(),$readonly);
+ &hidden_form_elements());
return;
}
@@ -1242,7 +981,7 @@ sub modifiable_only_title {
}
sub gather_authenitems {
- my ($cdom,$enrollvar,$readonly) = @_;
+ my ($cdom,$enrollvar) = @_;
my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom);
my $curr_authtype = '';
my $curr_authfield = '';
@@ -1266,8 +1005,7 @@ sub gather_authenitems {
kerb_def_auth => $krbdef,
mode => 'modifycourse',
curr_authtype => $curr_authtype,
- curr_autharg => $enrollvar->{'autharg'},
- readonly => $readonly,
+ curr_autharg => $enrollvar->{'autharg'}
);
my (%authform,$authenitems);
$authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
@@ -1286,7 +1024,7 @@ sub modify_course {
my %longtype = &course_settings_descrip($type);
my @items = ('internal.courseowner','description','internal.co-owners',
'internal.pendingco-owners','internal.selfenrollmgrdc',
- 'internal.selfenrollmgrcc','internal.mysqltables');
+ 'internal.selfenrollmgrcc');
my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
unless ($type eq 'Community') {
push(@items,('internal.coursecode','internal.authtype','internal.autharg',
@@ -1357,13 +1095,10 @@ sub modify_course {
$changed{'code'} = 1;
}
}
- if ( exists($env{'form.mysqltables'}) ) {
- $newattr{'mysqltables'} = $env{'form.mysqltables'};
- $newattr{'mysqltables'} =~ s/\D+//g;
- }
+
if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
- $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
$newattr{'defaultcredits'} =~ s/[^\d\.]//g;
+ $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
}
}
@@ -1455,8 +1190,6 @@ sub modify_course {
$shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles);
} elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
$shown = &mt('None');
- } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
- $shown = &mt('domain default');
}
$chgresponse .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
} else {
@@ -1467,8 +1200,6 @@ sub modify_course {
$shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
} elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
$shown = &mt('None');
- } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
- $shown = &mt('domain default');
}
$nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
@@ -1540,8 +1271,6 @@ sub modify_course {
$shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
} elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
$shown = &mt('None');
- } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
- $shown = &mt('domain default');
}
$nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
}
@@ -2154,7 +1883,13 @@ function changePage(formname,newphase) {
if ($phase eq 'setparms') {
$js .= $javascript_validations;
} elsif ($phase eq 'courselist') {
- $js .= <<"ENDJS";
+ $js .= qq|
+
+function gochoose(cname,cdom,cdesc) {
+ document.courselist.pickedcourse.value = cdom+'_'+cname;
+ document.courselist.submit();
+}
+
function hide_searching() {
if (document.getElementById('searching')) {
document.getElementById('searching').style.display = 'none';
@@ -2162,7 +1897,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');
@@ -2291,9 +2026,9 @@ ENDSCRIPT
}
my $starthash;
- if ($env{'form.phase'} eq 'adhocrole') {
+ if ($env{'form.phase'} eq 'ccrole') {
$starthash = {
- add_entries => {'onload' => "javascript:document.adhocrole.submit();"},
+ add_entries => {'onload' => "javascript:document.ccrole.submit();"},
};
} elsif ($phase eq 'courselist') {
$starthash = {
@@ -2360,7 +2095,6 @@ sub course_settings_descrip {
'co-owners' => "Username:domain of each co-owner",
'selfenrollmgrdc' => "Community-specific self-enrollment configuration by Domain Coordinator",
'selfenrollmgrcc' => "Community-specific self-enrollment configuration by Community personnel",
- 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)',
);
} else {
%longtype = &Apache::lonlocal::texthash(
@@ -2379,10 +2113,9 @@ sub course_settings_descrip {
'sectionnums' => 'Course section number:LON-CAPA section',
'crosslistings' => 'Crosslisted class:LON-CAPA section',
'defaultcredits' => 'Credits',
- 'autodropfailsafe' => "Failsafe section enrollment count",
'selfenrollmgrdc' => "Course-specific self-enrollment configuration by Domain Coordinator",
'selfenrollmgrcc' => "Course-specific self-enrollment configuration by Course personnel",
- 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)',
+
);
}
return %longtype;
@@ -2395,7 +2128,7 @@ sub hidden_form_elements {
'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
- 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n".
+ 'sections','newsec'],['^selfenrollmgr_'])."\n".
'<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
return $hidden_elements;
}
@@ -2408,42 +2141,6 @@ sub showcredits {
}
}
-sub get_permission {
- my ($dom) = @_;
- my ($allowed,%permission);
- if (&Apache::lonnet::allowed('ccc',$dom)) {
- $allowed = 1;
- %permission = (
- setquota => 'edit',
- processquota => 'edit',
- setanon => 'edit',
- processthreshold => 'edit',
- setpostsubmit => 'edit',
- processpostsubmit => 'edit',
- viewparms => 'view',
- setparms => 'edit',
- processparms => 'edit',
- catsettings => 'edit',
- processcat => 'edit',
- selfenroll => 'edit',
- adhocrole => 'coord',
- );
- } elsif (&Apache::lonnet::allowed('rar',$dom)) {
- $allowed = 1;
- %permission = (
- setquota => 'view',
- viewparms => 'view',
- setanon => 'view',
- setpostsubmit => 'view',
- setparms => 'view',
- catsettings => 'view',
- selfenroll => 'view',
- adhocrole => 'custom',
- );
- }
- return ($allowed,\%permission);
-}
-
sub handler {
my $r = shift;
if ($r->header_only) {
@@ -2454,8 +2151,8 @@ sub handler {
my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');
- my ($allowed,$permission) = &get_permission($dom);
- if ($allowed) {
+
+ if (&Apache::lonnet::allowed('ccc',$dom)) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -2491,7 +2188,7 @@ sub handler {
{href=>"javascript:changePage(document.$phase,'courselist')",
text=>$choose_text});
if ($phase eq 'courselist') {
- &print_course_selection_page($r,$dom,$domdesc,$permission);
+ &print_course_selection_page($r,$dom,$domdesc);
} else {
my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
if ($checked eq 'ok') {
@@ -2506,33 +2203,23 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
&print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
- $env{'form.pickedcourse'},$coursehash,
- $permission);
- } elsif ($phase eq 'adhocrole') {
+ $env{'form.pickedcourse'},$coursehash);
+ } elsif ($phase eq 'ccrole') {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:changePage(document.$phase,'adhocrole')",
+ ({href=>"javascript:changePage(document.$phase,'ccrole')",
text=>$enter_text});
- &print_adhocrole_selected($r,$type,$permission);
+ &print_ccrole_selected($r,$type);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'menu')",
text=>"Pick action"});
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- my ($readonly,$linktext);
- if ($permission->{$phase} eq 'view') {
- $readonly = 1;
- }
- if (($phase eq 'setquota') && ($permission->{'setquota'})) {
- if ($permission->{'setquota'} eq 'view') {
- $linktext = 'Set quota';
- } else {
- $linktext = 'Display quota';
- }
+ if ($phase eq 'setquota') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
- &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
+ text=>"Set quota"});
+ &print_setquota($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processquota') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setquota')",
text=>"Set quota"});
@@ -2540,12 +2227,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'setanon') && ($permission->{'setanon'})) {
+ } elsif ($phase eq 'setanon') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Threshold for anonymous submissions display"});
- &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) {
+ &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processthreshold') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setanon')",
text=>"Threshold for anonymous submissions display"});
@@ -2553,37 +2240,27 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'setpostsubmit') && ($permission->{'setpostsubmit'})) {
- if ($permission->{'setpostsubmit'} eq 'view') {
- $linktext = 'Submit button behavior post-submission';
- } else {
- $linktext = 'Configure submit button behavior post-submission';
- }
+ } elsif ($phase eq 'setpostsubmit') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
- &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processpostsubmit') && ($permission->{'processpostsubmit'})) {
+ text=>"Configure submit button behavior post-submission"});
+ &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processpostsubmit') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_postsubmit_config($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'viewparms') && ($permission->{'viewparms'})) {
+ } elsif ($phase eq 'viewparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'viewparms')",
text=>"Display settings"});
- &print_settings_display($r,$cdom,$cnum,$cdesc,$type,$permission);
- } elsif (($phase eq 'setparms') && ($permission->{'setparms'})) {
- if ($permission->{'setparms'} eq 'view') {
- $linktext = 'Display settings';
- } else {
- $linktext = 'Change settings';
- }
+ &print_settings_display($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'setparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
- text=>$linktext});
- &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) {
+ text=>"Change settings"});
+ &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processparms') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'setparms')",
text=>"Change settings"});
@@ -2591,12 +2268,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) {
+ } elsif ($phase eq 'catsettings') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Catalog settings"});
- &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly);
- } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) {
+ &print_catsettings($r,$cdom,$cnum,$cdesc,$type);
+ } elsif ($phase eq 'processcat') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'catsettings')",
text=>"Catalog settings"});
@@ -2604,12 +2281,12 @@ sub handler {
({href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Result"});
&modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
- } elsif (($phase eq 'selfenroll') && ($permission->{'selfenroll'})) {
+ } elsif ($phase eq 'selfenroll') {
&Apache::lonhtmlcommon::add_breadcrumb
({href => "javascript:changePage(document.$phase,'$phase')",
text => "Self-enrollment settings"});
if (!exists($env{'form.state'})) {
- &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly);
+ &print_selfenrollconfig($r,$type,$cdesc,$coursehash);
} elsif ($env{'form.state'} eq 'done') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'$phase')",