Merge branch 'setup' of https://bitbucket.org/PekopT/archilance into setup

archilance/management/commands/seed_data.py

@@ -63,20 +63,21 @@ class Command(BaseCommand):
         
         User.objects.create_superuser('admin@example.com', '123456')
         
+        customer_group = Group.objects.create(name='Исполнители')
+        contractor_group = Group.objects.create(name='Заказчики')
+        
         def create_user(i):
             username = 'user-%s' % i
             
             return User.objects.create(
                 first_name='User-%s' % i,
                 email='%s@example.com' % username,
-                is_active=_.sample((True, False)),
+                is_active=True,
             )
         
-        Group.objects.create(name='Исполнители')
-        Group.objects.create(name='Заказчики')
-        
         users = _.times(create_user, 50)
         
         for user in users:
             user.set_password('123')
+            user.groups.add(customer_group if user.pk % 2 == 0 else contractor_group)
             user.save()

users/admin.py

@@ -2,5 +2,15 @@ from django.contrib import admin
 
 from .models import User, Team
 
-admin.site.register(User)
+
+class UserAdmin(admin.ModelAdmin):
+    readonly_fields = ('pk',)
+    list_display = ('email','get_groups','is_active')
+    
+    def get_groups(self, obj):
+        return ', '.join(g.name for g in obj.groups.all())
+
+admin.site.register(User, UserAdmin)
+
+
 admin.site.register(Team)