[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm

[raeburn]

raeburn		Wed Oct 26 15:12:46 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11
    - Backport 1.456
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.59 loncom/interface/lonmenu.pm:1.369.2.60
--- loncom/interface/lonmenu.pm:1.369.2.59	Sat Oct 22 20:52:37 2016
+++ loncom/interface/lonmenu.pm	Wed Oct 26 15:12:46 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.59 2016/10/22 20:52:37 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.60 2016/10/26 15:12:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -415,7 +415,7 @@
                 $showfeeds = 1;
             }
         }
-        unless ($canmgr) {
+        unless (($canmgr) || ($canvgr)) {
             my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
             if (keys(%slots) > 0) {
                 $showresv = 1;
@@ -455,10 +455,10 @@
                 && $canvgr;
         next if    $$menuitem[4]  eq 'vgr'
                 && !$canvgr;
-        next if    $$menuitem[4]   eq 'cst'
+        next if    $$menuitem[4]   eq 'viewusers'
                 && !$canmodifyuser && !$canviewusers;
-        next if    $$menuitem[4]   eq 'ncst'
-                && ($canmodifyuser || !$canviewusers || !$canviewroster);
+        next if    $$menuitem[4]   eq 'noviewusers'
+                && ($canmodifyuser || $canviewusers || !$canviewroster);
         next if    $$menuitem[4]   eq 'mgr'
                 && !$canmgr;
         next if    $$menuitem[4]   eq 'showresv'
@@ -494,7 +494,7 @@
                         next if ($item->[2] eq 'vgr' && !$canvgr);
                         next if ($item->[2] eq 'opa' && !$canmodpara);
                         next if ($item->[2] eq 'vpa' && !$canviewpara);
-                        next if ($item->[2] eq 'cst' && !$canmodifyuser);
+                        next if ($item->[2] eq 'viewusers' && !($canmodifyuser || $canviewusers));
                         next if ($item->[2] eq 'mgr' && !$canmgr);
                         next if ($item->[2] eq 'vcg' && !$canviewgrps);
                         next if ($item->[2] eq 'mdc' && !$canedit);