[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
raeburn
raeburn at source.lon-capa.org
Thu Mar 5 16:04:37 EST 2020
raeburn Thu Mar 5 21:04:37 2020 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonmenu.pm
Log:
- For 2.11
Backport 1.501, 1.502
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.79 loncom/interface/lonmenu.pm:1.369.2.80
--- loncom/interface/lonmenu.pm:1.369.2.79 Sun Jan 19 00:24:30 2020
+++ loncom/interface/lonmenu.pm Thu Mar 5 21:04:37 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.369.2.79 2020/01/19 00:24:30 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.80 2020/03/05 21:04:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1019,12 +1019,13 @@
}
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
- if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
+ if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) &&
+ ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseida(/docs/|default_\d+\.page$)}) {
$menuitems.=(<<ENDREALRES);
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata
ENDREALRES
}
- unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) ||
+ unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) ||
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/})) {
$menuitems.=(<<ENDREALRES);
s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
@@ -1611,17 +1612,20 @@
if ((($cfile eq '') || (!$editbutton)) &&
($resurl =~ /$LONCAPA::assess_re/)) {
my $showurl = &Apache::lonnet::clutter($resurl);
+ my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
+ ? "/$env{'request.course.sec'}"
+ : '');
if ((&Apache::lonnet::allowed('cre','/')) &&
(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {
$viewsrcbutton = 1;
- } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {
+ } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) {
if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {
my $auname = $1;
if (($env{'request.course.adhocsrcaccess'} ne '') &&
(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
$viewsrcbutton = 1;
} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
- (&Apache::lonnet::allowed('bre','/'))) {
+ (&Apache::lonnet::allowed('bre',$crs_sec))) {
$viewsrcbutton = 1;
}
}
More information about the LON-CAPA-cvs
mailing list