[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /auth lonroles.pm

raeburn raeburn@source.lon-capa.org
Thu, 30 Dec 2010 21:18:18 -0000


raeburn		Thu Dec 30 21:18:18 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/auth	lonroles.pm 
  Log:
  - Support for pop-up Course Contents window (remotenavmap) retained in 2.10.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.256.2.4 loncom/auth/lonroles.pm:1.256.2.5
--- loncom/auth/lonroles.pm:1.256.2.4	Thu Sep  2 17:08:28 2010
+++ loncom/auth/lonroles.pm	Thu Dec 30 21:18:18 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.256.2.4 2010/09/02 17:08:28 raeburn Exp $
+# $Id: lonroles.pm,v 1.256.2.5 2010/12/30 21:18:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -579,7 +579,9 @@
 				    }
 				}
 # Are we allowed to look at the first resource?
-				if ($furl !~ m|^/adm/|) {
+				if (($furl !~ m|^/adm/|) || 
+                                    (($env{'environment.remotenavmap'} eq 'on') && 
+                                     ($furl =~ m{^/adm/navmaps}))) {
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}