--- loncom/interface/lonmodifycourse.pm 2016/08/15 18:01:08 1.85 +++ loncom/interface/lonmodifycourse.pm 2017/04/08 14:58:11 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.85 2016/08/15 18:01:08 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.92 2017/04/08 14:58:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -182,34 +182,192 @@ 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') { - $r->print(&mt('Actions available after searching for a community:').'
-$porthelpitem $lt{'gpqu'}: MB
+$porthelpitem $lt{'gpqu'}: MB
-$uploadhelpitem $lt{'upqu'}: MB
+$uploadhelpitem $lt{'upqu'}: MB
- +$submit
$hidden_elements $lt{'back'} @@ -543,7 +781,7 @@ ENDDOCUMENT } sub print_set_anonsurvey_threshold { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my %lt = &Apache::lonlocal::texthash( 'resp' => 'Responder threshold for anonymous survey submissions display:', 'sufa' => 'Anonymous survey submissions displayed when responders exceeds', @@ -566,13 +804,19 @@ 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 = ''; + } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold'); $r->print(<-$helpitem $lt{'sufa'}: - +$helpitem $lt{'sufa'}: +$submit
$hidden_elements $lt{'back'} @@ -582,7 +826,7 @@ ENDDOCUMENT } sub print_postsubmit_config { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my %lt = &Apache::lonlocal::texthash ( 'conf' => 'Configure submit button behavior after student makes a submission', 'disa' => 'Disable submit button/keypress following student submission', @@ -623,21 +867,27 @@ sub print_postsubmit_config { } &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_Postsubmit_Config'); $r->print(<$helpitem $lt{'disa'}: -
$hidden_elements $lt{'back'} @@ -674,7 +924,7 @@ sub domain_postsubtimeout { } sub print_catsettings { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; &print_header($r,$type); my %lt = &Apache::lonlocal::texthash( 'back' => 'Pick another action', @@ -695,6 +945,10 @@ 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)) { @@ -706,7 +960,7 @@ sub print_catsettings { } $r->print('');
+ '
');
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') {
@@ -725,7 +979,7 @@ sub print_catsettings {
if (ref($cathash) eq 'HASH') {
$r->print($lt{'assi'}.'
'.
&Apache::loncommon::assign_categories_table($cathash,
- $currsettings{'categories'},$type));
+ $currsettings{'categories'},$type,$disabled));
} else {
$r->print(&mt('No categories defined for this domain'));
}
@@ -736,8 +990,10 @@ sub print_catsettings {
$r->print('
'.&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).').'
'); } } - $r->print(''); + unless ($readonly) { + $r->print(''); + } } else { $r->print(''); if ($type eq 'Community') { @@ -754,7 +1010,7 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$crstype) = @_; + my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", @@ -768,12 +1024,11 @@ sub print_course_modification_page { 'domd' => 'Domain default', 'whom' => 'Who configures', ); - my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); + my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled); 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.mysqltables'],$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'}); @@ -784,9 +1039,12 @@ 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); + ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar,$readonly); } $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)) { @@ -827,9 +1085,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 .= ''.$hidden_elements. - 'print('this.form.submit();"'); - } else { - $r->print('javascript:verify_message(this.form);"'); + &Apache::lonhtmlcommon::end_pick_box().'
'.$hidden_elements); + unless ($readonly) { + $r->print('print('this.form.submit();"'); + } else { + $r->print('javascript:verify_message(this.form);"'); + } + $r->print(' value="'.$lt{'gobt'}.'" />'); } - $r->print(' value="'.$lt{'gobt'}.'" />
'); + $r->print(''); return; } sub print_selfenrollconfig { - my ($r,$type,$cdesc,$coursehash) = @_; + my ($r,$type,$cdesc,$coursehash,$readonly) = @_; return unless(ref($coursehash) eq 'HASH'); my $cnum = $coursehash->{'num'}; my $cdom = $coursehash->{'domain'}; @@ -949,7 +1210,7 @@ sub print_selfenrollconfig { ''.$cdesc.'').''."\n"); &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'}, $cdom,$cnum,\%currsettings, - &hidden_form_elements()); + &hidden_form_elements(),$readonly); return; } @@ -1005,7 +1266,7 @@ sub modifiable_only_title { } sub gather_authenitems { - my ($cdom,$enrollvar) = @_; + my ($cdom,$enrollvar,$readonly) = @_; my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; @@ -1029,7 +1290,8 @@ sub gather_authenitems { kerb_def_auth => $krbdef, mode => 'modifycourse', curr_authtype => $curr_authtype, - curr_autharg => $enrollvar->{'autharg'} + curr_autharg => $enrollvar->{'autharg'}, + readonly => $readonly, ); my (%authform,$authenitems); $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); @@ -1916,13 +2178,7 @@ function changePage(formname,newphase) { if ($phase eq 'setparms') { $js .= $javascript_validations; } elsif ($phase eq 'courselist') { - $js .= qq| - -function gochoose(cname,cdom,cdesc) { - document.courselist.pickedcourse.value = cdom+'_'+cname; - document.courselist.submit(); -} - + $js .= <<"ENDJS"; function hide_searching() { if (document.getElementById('searching')) { document.getElementById('searching').style.display = 'none'; @@ -1930,7 +2186,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'); @@ -2059,9 +2315,9 @@ ENDSCRIPT } my $starthash; - if ($env{'form.phase'} eq 'ccrole') { + if ($env{'form.phase'} eq 'adhocrole') { $starthash = { - add_entries => {'onload' => "javascript:document.ccrole.submit();"}, + add_entries => {'onload' => "javascript:document.adhocrole.submit();"}, }; } elsif ($phase eq 'courselist') { $starthash = { @@ -2178,6 +2434,42 @@ 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) { @@ -2188,8 +2480,8 @@ sub handler { my $dom = $env{'request.role.domain'}; my $domdesc = &Apache::lonnet::domain($dom,'description'); - - if (&Apache::lonnet::allowed('ccc',$dom)) { + my ($allowed,$permission) = &get_permission($dom); + if ($allowed) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -2227,7 +2519,7 @@ sub handler { {href=>"javascript:changePage(document.$phase,'courselist')", text=>$choose_text}); if ($phase eq 'courselist') { - &print_course_selection_page($r,$dom,$domdesc); + &print_course_selection_page($r,$dom,$domdesc,$permission); } else { my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc); if ($checked eq 'ok') { @@ -2244,23 +2536,33 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'menu')", text=>"Pick action"}); &print_modification_menu($r,$cdesc,$domdesc,$dom,$type, - $env{'form.pickedcourse'},$coursehash); - } elsif ($phase eq 'ccrole') { + $env{'form.pickedcourse'},$coursehash, + $permission); + } elsif ($phase eq 'adhocrole') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'ccrole')", + ({href=>"javascript:changePage(document.$phase,'adhocrole')", text=>$enter_text}); - &print_ccrole_selected($r,$type); + &print_adhocrole_selected($r,$type,$permission); } else { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'menu')", text=>"Pick action"}); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - if ($phase eq 'setquota') { + 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'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Set quota"}); - &print_setquota($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processquota') { + text=>$linktext}); + &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setquota')", text=>"Set quota"}); @@ -2268,12 +2570,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'setanon') { + } elsif (($phase eq 'setanon') && ($permission->{'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); - } elsif ($phase eq 'processthreshold') { + &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setanon')", text=>"Threshold for anonymous submissions display"}); @@ -2281,27 +2583,37 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'setpostsubmit') { + } 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'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Configure submit button behavior post-submission"}); - &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processpostsubmit') { + text=>$linktext}); + &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processpostsubmit') && ($permission->{'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') { + } elsif (($phase eq 'viewparms') && ($permission->{'viewparms'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'viewparms')", text=>"Display settings"}); - &print_settings_display($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'setparms') { + &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'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Change settings"}); - &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processparms') { + text=>$linktext}); + &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setparms')", text=>"Change settings"}); @@ -2309,12 +2621,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'catsettings') { + } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Catalog settings"}); - &print_catsettings($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processcat') { + &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'catsettings')", text=>"Catalog settings"}); @@ -2322,12 +2634,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'selfenroll') { + } elsif (($phase eq 'selfenroll') && ($permission->{'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); + &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')",