more session related bug fixes

This commit is contained in:
JT Smith 2006-01-15 18:34:44 +00:00
parent f2cccdff9f
commit b0ffb721b6
44 changed files with 143 additions and 143 deletions

View file

@ -54,7 +54,7 @@ If not specified, uses current user.
sub getAssetsInTrash {
my $self = shift;
my $limitToUser = shift;
my $userId = shift || $self->session->user->profileField("userId");
my $userId = shift || $self->session->user->userId;
my @assets;
my $limit;
if ($limitToUser) {
@ -124,7 +124,7 @@ sub trash {
return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage"));
$self->session->db->beginTransaction;
$self->session->db->write("update asset set state='trash-limbo' where lineage like ".$self->session->db->quote($self->get("lineage").'%'));
$self->session->db->write("update asset set state='trash', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
$self->session->db->write("update asset set state='trash', stateChangedBy=".$self->session->db->quote($self->session->user->userId).", stateChanged=".$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
$self->session->db->commit;
$self->{_properties}{state} = "trash";
$self->updateHistory("trashed");