sub do_edit :Exported {
my ($self, $r) = @_;
my $h = CGI::Untaint->new(%{$r->{params}});
- my ($obj) = @{$r->objects};
+ my ($obj) = @{$r->objects || []};
if ($obj) {
# We have something to edit
$obj->update_from_cgi($h);
}
sub delete :Exported {
+ return shift->SUPER::delete(@_) if caller ne "Maypole::Model::Base";
my ($self, $r) = @_;
- $_->SUPER::delete for @{ $r->objects };
+ $_->SUPER::delete for @{ $r->objects || [] };
$r->objects([ $self->retrieve_all ]);
$r->{template} = "list";
}
sub adopt {
my ($self, $child) = @_;
$child->autoupdate(1);
- $child->columns( Stringify => qw/ name / );
+ if (grep { $_ eq "name" } $child->columns) { # Common case
+ $child->columns( Stringify => qw/ name / );
+ } # Otherwise, work it out for yourself.
}
sub search :Exported {
- return shift->SUPER::search(@_) if caller eq "Class::DBI"; # oops
+ return shift->SUPER::search(@_) if caller ne "Maypole::Model::Base";
+ # A real CDBI search.
my ($self, $r) = @_;
my %fields = map {$_ => 1 } $self->columns;
my $oper = "like"; # For now
my %values = map { $_ => {$oper, $params{$_} } }
grep { $params{$_} and $fields{$_} } keys %params;
+ $self = $self->do_pager($r);
$r->objects([ %values ? $self->search_where(%values) : $self->retrieve_all ]);
$r->template("list");
$r->{template_args}{search} = 1;
}
+sub do_pager {
+ my ($self, $r) = @_;
+ if ( my $rows = $r->config->{rows_per_page}) {
+ return $r->{template_args}{pager} = $self->pager($rows, $r->query->{page});
+ } else { return $self }
+}
+
sub list :Exported {
my ($self, $r) = @_;
my %ok_columns = map {$_ => 1} $self->columns;
- if ( my $rows = $r->config->{rows_per_page}) {
- $self = $self->pager($rows, $r->query->{page});
- $r->{template_args}{pager} = $self;
- }
+ $self = $self->do_pager($r);
my $order;
if ($order = $r->query->{order} and $ok_columns{$order}) {
$r->objects([ $self->retrieve_all_sorted_by( $order.