Changeset 112

Timestamp:

12/11/10 10:56:15 (13 years ago)

Author:

nanardon

Message:

• add rpm/location subpage

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Rpms.pm (modified) (5 diffs)
• root/templates/html/rpms/location.html (added)
• root/templates/html/rpms/location.tt (added)
• root/templates/html/rpms/menu.tt (modified) (1 diff)
• t/controller_Rpms.t (modified) (1 diff)

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

@@ -131 +131 @@
 }
 
-=head2 rpms.location (PKGID)
-
-Return all distribution where the package having C<PKGID> can be found.
-
-=cut
-
-sub location : XMLRPCLocal {
-    my ($self, $c, $pkgid) = @_;
-
-    $c->stash->{xmlrpc} = [
-        map {
-        {
-            distribution => $_->get_column('name'),
-            release => $_->get_column('version'),
-            arch => $_->get_column('arch'), 
-            media => $_->get_column('label'),
-            media_group => $_->get_column('group_label'),
-        }
-        }
-        $c->forward('/distrib/distrib_rs', [ {} ])
-         ->search_related('MediasPaths')
-                 ->search_related('Paths')
-        ->search_related('Rpmfiles',
-            { pkgid => $pkgid },
-            {
-                select => [ qw(name version arch label group_label) ],
-            }
-        )->all ]
-
-
-}
-
 sub rpms_ :PathPrefix :Chained :CaptureArgs(1) {
     my ( $self, $c, $pkgid ) = @_;
@@ -178 +146 @@
 sub rpms : Private {
     my ( $self, $c, $pkgid, $subpart, @args) = @_;
-    $c->stash->{rpmurl} = $c->req->path;
     # Because $c->forward don't take into account Chained sub
     $c->forward('rpms_', [ $pkgid ]);
@@ -185 +152 @@
         /^files$/     and $c->go('files',     [ $pkgid, @args ]);
         /^changelog$/ and $c->go('changelog', [ $pkgid, @args ]);
-    }
+        /^location$/  and $c->go('location',  [ $pkgid, @args ]);
+    }
+    $c->stash->{rpmurl} = $c->req->path;
 
     return $c->stash->{xmlrpc} = $c->stash->{rpms};
@@ -281 +250 @@
 }
 
-sub changelog :Chained('rpms_') :PathPart('changelog') :Args(0) {
+sub changelog :Chained('rpms_') :PathPart('changelog') :Args(0) :XMLRPCLocal {
     my ( $self, $c, $pkgid ) = @_;
     $pkgid ||= $c->stash->{pkgid};
@@ -310 +279 @@
 }
 
+=head2 rpms.location (PKGID)
+
+Return all distribution where the package having C<PKGID> can be found.
+
+=cut
+
+sub location :Chained('rpms_') :PathPart('location') :Args(0) {
+    my ( $self, $c, $pkgid ) = @_;
+    $pkgid ||= $c->stash->{pkgid};
+    $c->stash->{rpmurl} = ($c->req->path =~ m:(.*)/[^/]+:)[0];
+
+    $c->stash->{xmlrpc} = [
+        map {
+        {
+            distribution => $_->get_column('name'),
+            dist => $_->get_column('shortname'),
+            release => $_->get_column('version'),
+            arch => $_->get_column('arch'), 
+            media => $_->get_column('label'),
+            media_group => $_->get_column('group_label'),
+        }
+        }
+        $c->forward('/distrib/distrib_rs', [ {} ])
+         ->search_related('MediasPaths')
+                 ->search_related('Paths')
+        ->search_related('Rpmfiles',
+            { pkgid => $pkgid },
+            {
+                select => [ qw(shortname name version arch label group_label) ],
+                order_by => [ qw(name version arch label) ],
+            }
+        )->all ]
+}
+
 =head1 AUTHOR
 

server/trunk/web/root/templates/html/rpms/menu.tt

@@ -3 +3 @@
 <a href="[% c.uri_for('/', rpmurl, 'files') %]">Files</a>
 <a href="[% c.uri_for('/', rpmurl, 'changelog') %]">ChangeLog</a>
+<a href="[% c.uri_for('/', rpmurl, 'location') %]">Location</a>

server/trunk/web/t/controller_Rpms.t

@@ -13 +13 @@
 ok( request("/rpms/$pkgid/files")->is_success, 'Request a pkgid/files should succeed' );
 ok( request("/rpms/$pkgid/changelog")->is_success, 'Request a pkgid/changelog should succeed' );
+ok( request("/rpms/$pkgid/location")->is_success, 'Request a pkgid/location should succeed' );
 done_testing();