Merge pull request #276 from PROCOLLAB-github/igorduino-pro-174

Присвоение одной специальности нескольким пользователям

Author: IgorDuino

core/models.py

@@ -155,6 +155,9 @@ class SkillToObject(models.Model):
 class SpecializationCategory(models.Model):
     name = models.TextField()
 
+    def __str__(self):
+        return self.name
+
     class Meta:
         verbose_name = "Категория специализации"
         verbose_name_plural = "Категории специализаций"
@@ -166,6 +169,9 @@ class Specialization(models.Model):
         SpecializationCategory, related_name="specializations", on_delete=models.CASCADE
     )
 
+    def __str__(self):
+        return self.name
+
     class Meta:
         verbose_name = "Специализация"
         verbose_name_plural = "Специализации"

users/admin.py

@@ -89,6 +89,7 @@ class CustomUserAdmin(admin.ModelAdmin):
         "first_name",
         "ordering_score",
         "is_active",
+        "v2_speciality",
     )
     list_display_links = (
         "id",
@@ -107,10 +108,9 @@ class CustomUserAdmin(admin.ModelAdmin):
         "is_staff",
         "is_superuser",
         "city",
+        "v2_speciality__name",
     )
 
-    raw_id_fields = ("v2_speciality",)
-
     readonly_fields = ("ordering_score",)
     change_form_template = "users/admin/users_change_form.html"
 

users/migrations/0045_alter_customuser_v2_speciality.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.3 on 2024-02-16 10:15
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0012_alter_specialization_options_and_more"),
+        ("users", "0044_auto_20240128_2236"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customuser",
+            name="v2_speciality",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="users",
+                to="core.specialization",
+            ),
+        ),
+    ]

users/models.py

@@ -86,13 +86,13 @@ class CustomUser(AbstractUser):
     region = models.CharField(max_length=255, null=True, blank=True)
     city = models.CharField(max_length=255, null=True, blank=True)
     organization = models.CharField(max_length=255, null=True, blank=True)
-    speciality = models.CharField(max_length=255, null=True, blank=True)
-    v2_speciality = models.OneToOneField(
-        "core.Specialization",  # avoid circular imports
+    v2_speciality = models.ForeignKey(
         on_delete=models.SET_NULL,
         null=True,
         related_name="users",
+        to="core.Specialization",
     )
+    speciality = models.CharField(max_length=255, null=True, blank=True)
     onboarding_stage = models.PositiveSmallIntegerField(
         null=True,
         blank=True,