Update queries/filters in galaxy admin controller to use sqlalchemy c…

…onstructs for True, False, testing for None.
galaxyproject · Feb 25, 2015 · bf56b93 · bf56b93
1 parent 62129c7
commit bf56b93
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -2,6 +2,8 @@
 import logging
 import os
 
+from sqlalchemy.sql import expression
+
 import galaxy.queue_worker
 import galaxy.util
 from galaxy import model
@@ -540,14 +542,14 @@ def create_quota( self, trans, **kwd ):
         new_in_users = []
         new_in_groups = []
         for user in trans.sa_session.query( trans.app.model.User ) \
-                                    .filter( trans.app.model.User.table.c.deleted==False ) \
+                                    .filter( trans.app.model.User.table.c.deleted == expression.false() ) \
                                     .order_by( trans.app.model.User.table.c.email ):
             if user.id in in_users:
                 new_in_users.append( ( user.id, user.email ) )
             else:
                 params.out_users.append( ( user.id, user.email ) )
         for group in trans.sa_session.query( trans.app.model.Group ) \
-                                     .filter( trans.app.model.Group.table.c.deleted==False ) \
+                                     .filter( trans.app.model.Group.table.c.deleted == expression.false() ) \
                                      .order_by( trans.app.model.Group.table.c.name ):
             if group.id in in_groups:
                 new_in_groups.append( ( group.id, group.name ) )
@@ -592,14 +594,14 @@ def manage_users_and_groups_for_quota( self, trans, **kwd ):
         in_groups = []
         out_groups = []
         for user in trans.sa_session.query( trans.app.model.User ) \
-                                    .filter( trans.app.model.User.table.c.deleted==False ) \
+                                    .filter( trans.app.model.User.table.c.deleted == expression.false() ) \
                                     .order_by( trans.app.model.User.table.c.email ):
             if user in [ x.user for x in quota.users ]:
                 in_users.append( ( user.id, user.email ) )
             else:
                 out_users.append( ( user.id, user.email ) )
         for group in trans.sa_session.query( trans.app.model.Group ) \
-                                     .filter( trans.app.model.Group.table.c.deleted==False ) \
+                                     .filter( trans.app.model.Group.table.c.deleted == expression.false()) \
                                      .order_by( trans.app.model.Group.table.c.name ):
             if group in [ x.group for x in quota.groups ]:
                 in_groups.append( ( group.id, group.name ) )
@@ -722,7 +724,7 @@ def _quota_op( self, trans, do_op, op_method, kwd, listify=False ):
                                                                         webapp=params.webapp,
                                                                         message=sanitize_text( str( e ) ),
                                                                         status='error' ) )
-        if do_op == True or ( do_op != False and params.get( do_op, False ) ):
+        if do_op is True or ( do_op is not False and params.get( do_op, False ) ):
             try:
                 message = op_method( quota, params )
                 return None, trans.response.send_redirect( web.url_for( controller='admin',