From f6ea15a5f95e6219e3e48c57a296002f2ed49798 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 23 2016 09:34:14 +0000 Subject: Reduce code duplication a little bit --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 43a3123..e1d8a0d 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -1436,22 +1436,20 @@ def search_projects( projects = projects.filter( model.Project.name == pattern ) - if sort == None or sort == 'projectname': - query = session.query( - model.Project - ).filter( - model.Project.id.in_(projects.subquery()) - ).order_by( + query = session.query( + model.Project + ).filter( + model.Project.id.in_(projects.subquery()) + ) + + if sort in [None, 'projectname']: + query = query.order_by( asc(func.lower(model.Project.name)) - ) + ) elif sort == 'date_created': - query = session.query( - model.Project - ).filter( - model.Project.id.in_(projects.subquery()) - ).order_by( + query = query.order_by( model.Project.date_created.desc() - ) + ) if start is not None: query = query.offset(start)