package Maypole::Model::CDBI;
use base qw(Maypole::Model::Base Class::DBI);
use Class::DBI::AsForm;
+# use Maypole::Form::CDBI;
+use CGI::Untaint;
+# use Maypole::Form;
+
use Class::DBI::FromCGI;
use Class::DBI::Loader;
use Class::DBI::AbstractSearch;
use Class::DBI::Pager;
use Lingua::EN::Inflect::Number qw(to_PL);
-use CGI::Untaint;
+
use strict;
=head1 NAME
}
sub related_class {
- my ( $self, $r, $accessor ) = @_;
- my $related = $self->related->{$accessor};
- if ( my $mapping = $related->{args}->{mapping} ) {
- return $related->{foreign_class}->meta_info('has_a')->{ $$mapping[0] }
- ->{foreign_class};
- }
- else {
- return $related->{foreign_class};
- }
-}
+ my ( $self, $r, $accessor ) = @_;
+ my $meta = $self->meta_info;
+ my @rels = keys %$meta;
+ my $related;
+ foreach (@rels) {
+ $related = $meta->{$_}{$accessor};
+ last if $related;
+ }
+ return unless $related;
+
+ my $mapping = $related->{args}->{mapping};
+ if ( $mapping and @$mapping ) {
+ return $related->{foreign_class}->meta_info('has_a')->{$$mapping[0]}->{foreign_class};
+ }
+ else {
+ return $related->{foreign_class};
+ }
+ }
+
sub do_edit : Exported {
my ( $self, $r ) = @_;
{ required => $r->{config}{ $r->{table} }{required_cols} || [], }
);
};
- $fatal = $@;
+ if ($fatal = $@) {
+ warn "$fatal" if $r->debug;
+ }
$creating++;
}
if ( my %errors = $fatal ? (FATAL => $fatal) : $obj->cgi_update_errors ) {
$r->{template_args}{cgi_params} = $r->{params};
$r->{template_args}{errors} = \%errors;
- if ($creating) {
- undef $obj;
- $r->template("addnew");
- } else {
- $r->template("edit");
- }
+ undef $obj if $creating;
+ $r->template("edit");
}
else {
$r->{template} = "view";
}
- $r->objects( [$obj] );
+ $r->objects( $obj ? [$obj] : []);
}
sub delete : Exported {
my $class = shift;
return (
$class->columns("Stringify"),
+ ( grep { /^(name|title)$/i } $class->columns ),
( grep { /(name|title)/i } $class->columns ),
( grep { !/id$/i } $class->primary_columns ),
)[0];
my $oper = "like"; # For now
my %params = %{ $r->{params} };
my %values = map { $_ => { $oper, $params{$_} } }
- grep { length ($params{$_}) and $fields{$_} } keys %params;
+ grep { defined $params{$_} && length ($params{$_}) && $fields{$_} }
+ keys %params;
$r->template("list");
if ( !%values ) { return $self->list($r) }
sub order {
my ( $self, $r ) = @_;
- my $order;
my %ok_columns = map { $_ => 1 } $self->columns;
- if ( $order = $r->query->{order} and $ok_columns{$order} ) {
- $order .= ( $r->query->{o2} eq "desc" && " DESC" );
- }
- $order;
+ my $q = $r->query;
+ my $order = $q->{order};
+ return unless $order and $ok_columns{$order};
+ $order .= ' DESC' if $q->{o2} and $q->{o2} eq 'desc';
+ return $order;
}
sub list : Exported {
dsn => $dsn,
user => $u,
password => $p,
- options => $opts,
+ %$opts,
)
);
$config->{classes} = [ $config->{loader}->classes ];