Selaa lähdekoodia

HUE-8530 [organization] Backward compatibility for User.objects.values_list

Romain 5 vuotta sitten
vanhempi
commit
ffbe9b2b47

+ 8 - 0
apps/useradmin/src/useradmin/models2.py

@@ -142,6 +142,14 @@ class UserManager(BaseUserManager):
 
     return super(UserManager, self).order_by(*args, **kwargs)
 
+  def values_list(self, *args, **kwargs):
+    if 'username' in args:
+      args = list(args)
+      args.remove('username')
+      args.append('email')
+
+    return super(UserManager, self).values_list(*args, **kwargs)
+
   def _create_user(self, email, password, **extra_fields):
     """Create and save a User with the given email and password."""
     if not email:

+ 2 - 0
apps/useradmin/src/useradmin/models2_tests.py

@@ -129,5 +129,7 @@ class TestOrganizationSingleUser(unittest.TestCase):
 
     User.objects.filter(groups__in=Group.objects.all()).order_by('username')
 
+    User.objects.values_list('username', flat=True)
+
     self.client2.get('/useradmin/groups/edit/default')