Browse Source

Put abandonned package at end of the list

Sullivan SENECHAL 9 years ago
parent
commit
c0102b2faa

+ 3 - 1
src/Packagist/WebBundle/Controller/PackageController.php

@@ -57,7 +57,9 @@ class PackageController extends Controller
 
         $packages = $this->getDoctrine()
             ->getRepository('PackagistWebBundle:Package')
-            ->getFilteredQueryBuilder($filters);
+            ->getFilteredQueryBuilder($filters)
+            ->addOrderBy('p.id', 'DESC')
+        ;
 
         $data['packages'] = $this->setupPager($packages, $page);
         $data['meta'] = $this->getPackagesMetadata($data['packages']);

+ 1 - 1
src/Packagist/WebBundle/Controller/UserController.php

@@ -170,7 +170,7 @@ class UserController extends Controller
         $packages = $this->getDoctrine()
             ->getRepository('PackagistWebBundle:Package')
             ->getFilteredQueryBuilder(array('maintainer' => $user->getId()))
-            ->orderBy('p.name');
+            ->addOrderBy('p.name');
 
         $paginator = new Pagerfanta(new DoctrineORMAdapter($packages, true));
         $paginator->setMaxPerPage(15);

+ 3 - 2
src/Packagist/WebBundle/Entity/PackageRepository.php

@@ -279,7 +279,7 @@ class PackageRepository extends EntityRepository
             $qb->leftJoin('v.tags', 't');
         }
 
-        $qb->orderBy('p.id', 'DESC');
+        $qb->orderBy('p.abandoned');
 
         $this->addFilters($qb, $filters);
 
@@ -347,7 +347,8 @@ class PackageRepository extends EntityRepository
             ->where('v.development = true')
             ->andWhere('(r.packageName = :name OR dr.packageName = :name)')
             ->groupBy('p.id, p.name, p.description, p.language, p.abandoned, p.replacementPackage')
-            ->orderBy('p.name')
+            ->orderBy('p.abandoned')
+            ->addOrderBy('p.name')
             ->setParameter('name', $name);
 
         return $qb->getQuery()