--- loncom/auth/lonroles.pm 2010/09/02 17:08:28 1.256.2.4 +++ loncom/auth/lonroles.pm 2014/05/05 11:37:41 1.256.2.8 @@ -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.8 2014/05/05 11:37:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -579,7 +579,9 @@ ENDENTERKEY } } # 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(); } @@ -1602,7 +1604,7 @@ sub check_release_required { my $otherserver; if (($major eq '' && $minor eq '') || (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { - my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'}); + my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required,1); my $switchlcrev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'}, $userdomserver); @@ -1611,7 +1613,7 @@ sub check_release_required { (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) { my $cdom = $env{'course.'.$tcourseid.'.domain'}; if ($cdom ne $env{'user.domain'}) { - my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom); + my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom,undef,$required,1); my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname); my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); @@ -1761,7 +1763,7 @@ sub display_cc_role { my %newhash=&Apache::lonnet::coursedescription($tcourseid); if (%newhash) { $twhere=$newhash{'description'}. - ' '. + ' '. &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). ''; $ttype = $newhash{'type'};