--- loncom/interface/lonmenu.pm 2016/12/01 16:53:15 1.369.2.67 +++ loncom/interface/lonmenu.pm 2017/03/14 21:14:21 1.369.2.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.67 2016/12/01 16:53:15 raeburn Exp $ +# $Id: lonmenu.pm,v 1.369.2.70 2017/03/14 21:14:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1501,8 +1501,8 @@ sub prepare_functions { # This applies in course context # if (($perms{'mdc'}) && - (($resurl eq "/public/$cdom/$cnum/syllabus") || - ($resurl =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}))) { + (($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) || + ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}))) { $cfile = $resurl; $home = &Apache::lonnet::homeserver($cnum,$cdom); if ($env{'form.forceedit'}) { @@ -2360,7 +2360,7 @@ sub roles_selector { my ($cdom,$cnum,$httphost) = @_; my $crstype = &Apache::loncommon::course_type(); my $now = time; - my (%courseroles,%seccount,%courseprivs); + my (%courseroles,%seccount,%courseprivs,%roledesc); my $is_cc; my ($js,$form,$switcher); my $ccrole; @@ -2410,7 +2410,7 @@ sub roles_selector { if ($is_cc) { &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs); } elsif ($env{'request.role'} =~ m{^\Qcr/$cdom/$cdom-domainconfig/\E(\w+)\.\Q/$cdom/$cnum\E}) { - &get_customadhoc_roles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$privref); + &get_customadhoc_roles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,\%roledesc,$privref); } else { my %gotnosection; foreach my $item (keys(%env)) { @@ -2464,7 +2464,7 @@ sub roles_selector { } if ((keys(%seccount) > 1) || ($numdiffsec > 1)) { my @submenu; - $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$privref); + $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref); $form = '