--- loncom/auth/lonroles.pm 2013/08/07 00:03:29 1.289
+++ loncom/auth/lonroles.pm 2014/01/08 16:59:54 1.293
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.289 2013/08/07 00:03:29 raeburn Exp $
+# $Id: lonroles.pm,v 1.293 2014/01/08 16:59:54 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -545,13 +545,14 @@ ENDENTERKEY
}
}
if (($env{'form.orgurl'}) &&
- ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
+ ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
+ ($env{'form.orgurl'} ne '/adm/roles')) {
my $dest=$env{'form.orgurl'};
if ($env{'form.symb'}) {
if ($dest =~ /\?/) {
$dest .= '&';
} else {
- $dest .= '?'
+ $dest .= '?';
}
$dest .= 'symb='.$env{'form.symb'};
}
@@ -2466,7 +2467,7 @@ sub update_session_roles {
if ($desc) {
$newmsg .= '
'.
&mt('[_1] with status: [_2].',
- $desc,$newrole{$item}).'';
+ $desc,&mt($newrole{$item})).'';
}
}
if ($newmsg) {
@@ -2733,11 +2734,14 @@ sub get_roles_functions {
}
if ($env{'user.adv'}) {
if ($env{'form.display'} eq 'showall') {
- push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
+ push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]);
} else {
- push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
+ push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]);
}
}
+ if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
+ push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
+ }
my $funcs = &Apache::lonhtmlcommon::start_funclist();
foreach my $link (@links) {
$funcs .= &Apache::lonhtmlcommon::add_item_funclist(