--- loncom/interface/loncoursegroups.pm 2006/02/21 22:40:45 1.7
+++ loncom/interface/loncoursegroups.pm 2006/02/23 17:23:09 1.8
@@ -782,7 +782,7 @@ function changeSort(caller) {
\@sections,\%states,\%navbuttons,$rowColor1,$rowColor2);
last;
} else {
- if (($state =~ /^\w+result$/) && ($i > 0)) {
+ if (($state eq 'result') && ($i > 0)) {
&Apache::lonhtmlcommon::add_breadcrumb(
{href=>"javascript:backPage(document.$state,'$states{$action}[0]')",
text=>"$trail{$action}{$states{$action}[$i]}"});
@@ -2914,6 +2914,11 @@ sub process_membership {
&Apache::loncommon::get_env_multiple('form.userpriv_'.$priv);
foreach my $user (@users) {
$group_privs{$user} .= $priv.':';
+ if ($state eq 'memresult') {
+ unless (exists($$usertools{$user}{$tool})) {
+ $$usertools{$user}{$tool} = 1;
+ }
+ }
}
} else {
if (@{$defprivs} > 0) {
@@ -2985,7 +2990,7 @@ sub process_membership {
}
}
}
- }
+ }
foreach my $user (sort(keys(%{$usertools}))) {
my $type;
@@ -3024,13 +3029,14 @@ sub process_membership {
if ($num_ok) {
foreach my $type (sort(keys(%added))) {
$r->print(&mt('The following users were successfully [_1]',$type));
- if ($type eq 'activated' || $type eq 'added' || $type eq 'reenabled') {
+ if (!($type eq 'deleted' || $type eq 'expired')) {
$r->print(&mt(' with the following privileges'));
}
$r->print(':
');
foreach my $user (@{$added{$type}}) {
- my $privlist;
- if ($type eq 'activated' || $type eq 'added') {
+ my $privlist = '';
+ if (!($type eq 'deleted' || $type eq 'expired')) {
+ $privlist = ': ';
my @privs = split(/:/,$group_privs{$user});
my $curr_tool = '';
foreach my $priv (@privs) {
@@ -3042,7 +3048,7 @@ sub process_membership {
}
$privlist =~ s/, $//;
}
- $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.': '.$privlist.'
');
+ $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.$privlist.'
');
}
}
}