fixed search ordering in Maypole::Model::CDBI and parameter handling in CGI::Maypole

[maypole.git] / lib / Maypole / Model / CDBI.pm

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 6ad14171255cad627ee61722099fbe4cd190a71a..171c9164b21de239d2dcde9e75f20200eebb2765 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -105,8 +105,9 @@ sub search : Exported {
     $self = $self->do_pager($r);
     $r->objects(
         [
-            $self->search_where( \%values ),
-            ( $order ? { order => $order } : () )
+            $self->search_where(
+                \%values, ( $order ? { order => $order } : () )
+            )
         ]
     );
     $r->{template_args}{search} = 1;
@@ -127,9 +128,9 @@ sub 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;
     }
+    $order;
+}
 
 sub list : Exported {
     my ( $self, $r ) = @_;
@@ -144,19 +145,21 @@ sub list : Exported {
 }
 
 sub setup_database {
-    my ($self, $config, $namespace, $dsn, $u, $p, $opts) = @_;
+    my ( $self, $config, $namespace, $dsn, $u, $p, $opts ) = @_;
     $dsn  ||= $config->dsn;
     $u    ||= $config->user;
     $p    ||= $config->pass;
     $opts ||= $config->opts;
     $config->dsn($dsn);
-    $config->loader || $config->loader( Class::DBI::Loader->new(
-        namespace => $namespace,
-        dsn => $dsn,
-        user => $u,
-        password => $p,
-        options => $opts,
-    ) );
+    $config->loader || $config->loader(
+        Class::DBI::Loader->new(
+            namespace => $namespace,
+            dsn       => $dsn,
+            user      => $u,
+            password  => $p,
+            options   => $opts,
+        )
+    );
     $config->{classes} = [ $config->{loader}->classes ];
     $config->{tables}  = [ $config->{loader}->tables ];
 }