Changeset 21 for server/trunk/web
- Timestamp:
- 11/23/10 03:14:23 (14 years ago)
- Location:
- server/trunk/web
- Files:
-
- 5 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
server/trunk/web/lib/Sophie/Controller/Distrib.pm
r20 r21 33 33 my $rs = $c->model('Base')->resultset('Distribution'); 34 34 if (!$distribution) { 35 return $c->stash->{xmlrpc} = [ map { $_->name } $rs->all ]; 35 return $c->stash->{xmlrpc} = [ map { $_->name } 36 $rs->search(undef, { order_by => ['name'] })->all ]; 36 37 } 37 38 $rs = $rs->search(name => $distribution)->search_related('Release'); 38 39 if (!$release) { 39 return $c->stash->{xmlrpc} = [ map { $_->version } $rs->all ];40 40 return $c->stash->{xmlrpc} = [ map { $_->version } 41 $rs->search(undef, { order_by => ['version'] })->all ]; 41 42 } 42 43 $rs = $rs->search(version => $release)->search_related('Arch'); 43 44 if (!$arch) { 44 return $c->stash->{xmlrpc} = [ map { $_->arch } $rs->all ]; 45 return $c->stash->{xmlrpc} = [ map { $_->arch } 46 $rs->search(undef, { order_by => ['arch'] })->all ]; 45 47 } 46 48 $rs = $rs->search(arch => $arch)->search_related('Medias'); 47 $c->stash->{xmlrpc} = [ map { $_->label } $rs->all ];48 $c->stash->{xmlrpc}49 return $c->stash->{xmlrpc} = [ map { $_->label } 50 $rs->search(undef, { order_by => ['label'] })->all ]; 49 51 } 50 52 … … 117 119 sub distrib :Chained('distrib_view') PathPart('') { 118 120 my ( $self, $c ) = @_; 119 $c->forward('list', $c->stash->{dist}); 120 $c->forward('rpms', $c->stash->{dist}); 121 $c->forward('list', [ $c->stash->{dist} ]); 121 122 # TODO store properly results 122 123 # No call from json here … … 208 209 sub rpm_by_name :Chained('distrib_view') PathPart('rpms/by-name') Args(1) { 209 210 } 210 sub rpm_by_pkid :Chained('distrib_view') PathPart(' rpms/by-pkgid') Args(1) {211 sub rpm_by_pkid :Chained('distrib_view') PathPart('by-pkgid') Args(1) { 211 212 } 212 213 … … 250 251 $c->forward('media_rpms', [ $c->stash->{dist}, $c->stash->{media} ]); 251 252 } 252 sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by_name') { 253 my ( $self, $c ) = @_; 254 } 255 sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by_name') { 256 my ( $self, $c ) = @_; 257 } 258 sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('rpms/by_pkgid') { 259 my ( $self, $c ) = @_; 253 254 sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by-name') { 255 my ( $self, $c ) = @_; 256 } 257 sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by-name') { 258 my ( $self, $c ) = @_; 259 } 260 sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('by-pkgid') { 261 my ( $self, $c, $pkgid ) = @_; 262 $c->forward('/rpms/queryformat', [ $pkgid, '%{name}' ]); 260 263 } 261 264 -
server/trunk/web/t/controller_Distrib.t
r17 r21 7 7 # know existing data: 8 8 my $distribution = 'Mandriva'; 9 my $release = 'cooker'; 10 my $arch = 'i586'; 9 11 10 12 BEGIN { use_ok 'Catalyst::Test', 'Sophie' } … … 26 28 ok( request( xmlrpcreq('distrib.list') ), "XMLRPC"); 27 29 ok( request( xmlrpcreq('distrib.list', $distribution) ), "XMLRPC"); 30 ok( request("/distrib/$distribution/$release")->is_success, 'Request should succeed' ); 31 ok( request("/distrib/$distribution/$release/$arch")->is_success, 'Request should succeed' ); 28 32 done_testing();
Note: See TracChangeset
for help on using the changeset viewer.