--- loncom/auth/lonroles.pm 2009/12/24 18:28:54 1.240.2.5
+++ loncom/auth/lonroles.pm 2010/01/05 15:30:25 1.240.2.7
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.240.2.5 2009/12/24 18:28:54 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.7 2010/01/05 15:30:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -165,6 +165,7 @@ sub redirect_user {
my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
{'redirect' => [1,$url],
'bread_crumbs' => $brcrum,});
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
my $end_page = &Apache::loncommon::end_page();
# Note to style police:
@@ -751,6 +752,10 @@ ENDSCRIPT
$r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
&Apache::loncommon::end_page());
return OK;
+ } else {
+ if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+ delete($env{'form.destinationurl'});
+ }
}
if ($env{'user.adv'}) {
$r->print('
&');
- $r->print(
- ''
- .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
- .' to view all [_4] LON-CAPA courses and communities.'
- ,''
- ,''
- ,' ',$domdesc)
- .' '
- .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
+ unless ($env{'user.domain'} eq 'gcitest') {
+ $r->print(
+ '
'
+ .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
+ .' to view all [_4] LON-CAPA courses and communities.'
+ ,''
+ ,''
+ ,' ',$domdesc)
+ .' '
+ .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
.' you may be able to enroll if self-enrollment is permitted.'
,'',' ')
- .'
'
- );
+ .'
'
+ );
+ }
}
}
@@ -786,8 +793,10 @@ ENDSCRIPT
} else {
$r->print(''.&mt('Currently no active roles, courses or communities').' ');
}
- &findcourse_advice($r);
- &requestcourse_advice($r);
+ unless ($env{'user.domain'} eq 'gcitest') {
+ &findcourse_advice($r);
+ &requestcourse_advice($r);
+ }
$r->print('');
if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));