Changeset 449

Timestamp:

07/09/12 15:40:46 (12 years ago)

Author:

nanardon

Message:

• don't use -nast anymore (deprecated)
• don't use potential futur keywords
• fix DBIx class query

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• 0Explorer.pm (modified) (1 diff)
• Admin.pm (modified) (2 diffs)
• Search/Rpms.pm (modified) (1 diff)

server/trunk/web/lib/Sophie/Controller/0Explorer.pm

@@ -94 +94 @@
           },
           { 
-              'select' => [ 'contents is NOT NULL as has_content', 'rpmfilesmode(mode) as perm', @col, '"group"',
-                  '"user"' ],
+              'select' => "contents is NOT NULL as has_content,
+              rpmfilesmode(mode) as perm, " . join( ', ', @col) . ", \"group\",
+                  \"user\"",
               as => [ qw(has_content perm), @col, 'group', 'user' ],
               order_by => [ 'pkgid' ],

server/trunk/web/lib/Sophie/Controller/Admin.pm

@@ -26 +26 @@
 
     $c->forward('/begin');
-}
-
-=head2 index
-
-=cut
-
-sub index :Path :Args(0) {
-    my ( $self, $c ) = @_;
-
-    $c->response->body('Matched Sophie::Controller::Admin in Admin.');
 }
 
@@ -455 +445 @@
 }
 
-sub help : private {
+sub help : Private {
     my ( $self, $c, $cmd ) = @_;
     my $ctx = $c->session->{admin_ctx} || '';

server/trunk/web/lib/Sophie/Controller/Search/Rpms.pm

@@ -146 +146 @@
     $searchspec ||= {};
 
-    $c->stash->{rs} =
-        $c->forward('rpms_rs')->search({
-            -nest => \[
-                "Rpmfiles.added > '1970-01-01'::date + ?::interval",
-                [ plain_text => "$date seconds" ],   
-            ],
-        });
+    $c->stash->{rs} = $c->forward('rpms_rs')->search(
+        \[ "Rpmfiles.added > '1970-01-01'::date + ?::interval",
+            [ plain_text => "$date seconds" ],
+        ]
+    );
 }