package Maypole::Model::CDBI;
use base qw(Maypole::Model::Base Class::DBI);
-use Lingua::EN::Inflect::Number qw(to_PL);
use Class::DBI::AsForm;
use Class::DBI::FromCGI;
use Class::DBI::Loader;
use Class::DBI::AbstractSearch;
use Class::DBI::Plugin::RetrieveAll;
use Class::DBI::Pager;
+
+use Lingua::EN::Inflect::Number qw(to_PL);
use CGI::Untaint;
use strict;
sub related {
my ($self, $r) = @_;
- # Has-many methods; XXX this is a hack
- map {to_PL($_)}
- grep { exists $r->{config}{ok_tables}{$_} }
- map {$_->table}
- keys %{shift->__hasa_list || {}}
+ return keys %{$self->meta_info('has_many') || {}};
}
sub do_edit :Exported {
my ($self, $r) = @_;
my $h = CGI::Untaint->new(%{$r->{params}});
+ my $creating = 0;
my ($obj) = @{$r->objects || []};
if ($obj) {
# We have something to edit
$obj->update_from_cgi($h);
} else {
$obj = $self->create_from_cgi($h);
+ $creating++;
}
if (my %errors = $obj->cgi_update_errors) {
# Set it up as it was:
$r->{template_args}{cgi_params} = $r->{params};
$r->{template_args}{errors} = \%errors;
$r->{template} = "edit";
+ undef $obj if $creating; # Couldn't create
} else {
$r->{template} = "view";
}
sub stringify_column {
my $class = shift;
return ($class->columns("Stringify"),
- (grep { $_ ne "id" } $class->primary_columns),
- (grep { $_ eq "name" } $class->columns)
+ (grep { /(name|title)/i } $class->columns),
+ (grep { !/id$/i } $class->primary_columns),
)[0];
}
$r->template("list");
if (!%values) { return $self->list($r) }
- $self = $self->do_pager($r);
my $order = $self->order($r);
+ $self = $self->do_pager($r);
$r->objects([ $self->search_where(\%values),
($order ? { order => $order } : ())
]);
sub list :Exported {
my ($self, $r) = @_;
- $self = $self->do_pager($r);
my $order = $self->order($r);
+ $self = $self->do_pager($r);
if ($order) {
$r->objects([ $self->retrieve_all_sorted_by( $order )]);
} else {