oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '8' into psgi

Browse source 
Conflicts:
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Session/Scratch.pm
This commit is contained in:
Doug Bell 2010-04-21 13:03:03 -05:00
commit cb3f83a93e
45 changed files with 987 additions and 860 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Group.pm
View file

@ -126,7 +126,7 @@ not be added to any group. Groups may not be added to themselves.
sub addGroups {
my $self = shift;
my $groups = shift;
eval{$self->session->cache->delete($self->getId)};
$self->session->cache->remove("group_" . $self->getId);
GROUP: foreach my $gid (@{$groups}) {
next if ($gid eq '1');
next if ($gid eq $self->getId);
@ -233,7 +233,7 @@ sub clearCaches {
my $groups = $self->getAllGroupsFor();
my $cache = $self->session->cache;
foreach my $group ( $self->getId, @{ $groups } ) {
eval{$cache->delete($group)};
$cache->remove("group_".$group);
}
my $stow = $self->session->stow;
$stow->delete("groupObj");
@ -546,7 +546,7 @@ sub getAllUsers {
my $loopCount = shift;
my $expireTime = 0;
my $cache = $self->session->cache;
my $value = eval{$cache->get($self->getId)};
my $value = $cache->get("group_".$self->getId);
return $value if defined $value;
my @users = ();
push @users,
@ -571,7 +571,7 @@ sub getAllUsers {
}
my %users = map { $_ => 1 } @users;
@users = keys %users;
eval{$cache->set($self->getId, \@users, $self->groupCacheTimeout)};
$cache->set("group_".$self->getId, \@users, $self->groupCacheTimeout);
return \@users;
}