X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;h=4321ad8e978b940135cc72ef9424d55ed0e6bffa;hb=bec4a6ff4a3503a297ce1226f9bbd46341193616;hp=8b753df5432b058f53b5e56a353a4f06b55fcc00;hpb=21f7227de6443b25f6a5a71ce6698d2b73350bc5;p=maypole.git diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm index 8b753df..4321ad8 100644 --- a/lib/Maypole/Model/CDBI.pm +++ b/lib/Maypole/Model/CDBI.pm @@ -1,12 +1,13 @@ 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; @@ -25,6 +26,7 @@ modules. sub related { my ($self, $r) = @_; + # Has-many methods; XXX this is a hack map {to_PL($_)} grep { exists $r->{config}{ok_tables}{$_} } @@ -65,8 +67,8 @@ sub delete :Exported { 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]; }