X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a5fbf5a8724d46bfcf0fb944d8b44185a8fb3f71..862bc8ce30cd40b67d2856ac7f1d11d5e4322f09:/SL/DB/Helper/ActsAsList.pm diff --git a/SL/DB/Helper/ActsAsList.pm b/SL/DB/Helper/ActsAsList.pm index f48e9967a..ee49f4aed 100644 --- a/SL/DB/Helper/ActsAsList.pm +++ b/SL/DB/Helper/ActsAsList.pm @@ -40,7 +40,7 @@ sub move_position_down { sub remove_from_list { my ($self) = @_; - my $worker = sub { + return $self->db->with_transaction(sub { remove_position($self); # Set to -1 manually because $self->update_attributes() would @@ -56,9 +56,7 @@ sub remove_from_list { SQL $self->db->dbh->do($sql, undef, $self->$primary_key_col); $self->$column(undef); - }; - - return $self->db->in_transaction ? $worker->() : $self->db->do_transaction($worker); + }); } sub add_to_list { @@ -109,12 +107,10 @@ sub add_to_list { ${group_by} SQL - my $worker = sub { + return $self->db->with_transaction(sub { $self->db->dbh->do($query, undef, $new_position - 1, @values); $self->update_attributes($column => $new_position); - }; - - return $self->db->in_transaction ? $worker->() : $self->db->do_transaction($worker); + }); } sub get_next_in_list { @@ -144,7 +140,7 @@ sub reorder_list { my $self = ref($class_or_self) ? $class_or_self : $class_or_self->new; my $column = column_name($self); - my $result = $self->db->do_transaction(sub { + my $result = $self->db->with_transaction(sub { my $query = qq|UPDATE | . $self->meta->table . qq| SET ${column} = ? WHERE id = ?|; my $sth = $self->db->dbh->prepare($query) || die $self->db->dbh->errstr; @@ -153,6 +149,8 @@ sub reorder_list { } $sth->finish; + + 1; }); return $result;