[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface lonmenu.pm
raeburn
raeburn@source.lon-capa.org
Fri, 15 May 2009 20:36:17 -0000
raeburn Fri May 15 20:36:17 2009 EDT
Modified files: (Branch: version_2_8_X)
/loncom/interface lonmenu.pm
Log:
- Completes backport of 1.262.
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.239.4.4 loncom/interface/lonmenu.pm:1.239.4.5
--- loncom/interface/lonmenu.pm:1.239.4.4 Wed May 13 03:26:11 2009
+++ loncom/interface/lonmenu.pm Fri May 15 20:36:17 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.239.4.4 2009/05/13 03:26:11 raeburn Exp $
+# $Id: lonmenu.pm,v 1.239.4.5 2009/05/15 20:36:17 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1460,34 +1460,6 @@
}
if ($is_cc) {
&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
- my %adv_roles =
- &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
- foreach my $role (keys(%adv_roles)) {
- my ($urole,$usec) = split(/:/,$role);
- if (!$gotnosection{$urole}) {
- $seccount{$urole} ++;
- $gotnosection{$urole} = 1;
- }
- if (ref($courseroles{$urole}) eq 'ARRAY') {
- if ($usec ne '') {
- if (!grep(/^Q$usec\E$/,@{$courseroles{$urole}})) {
- push(@{$courseroles{$urole}},$usec);
- $seccount{$urole} ++;
- }
- }
- } else {
- @{$courseroles{$urole}} = ();
- if ($usec ne '') {
- $seccount{$urole} ++;
- push(@{$courseroles{$urole}},$usec);
- }
- }
- }
- my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
- @{$courseroles{'st'}} = ();
- if (keys(%sections_count) > 0) {
- push(@{$courseroles{'st'}},keys(%sections_count));
- }
} else {
my %gotnosection;
foreach my $item (keys(%env)) {