Merge pull request #517 from PROCOLLAB-github/dev

Изменения в административную панель в части специлизаций

Author: Toksi86

.github/workflows/django-test.yml

@@ -3,9 +3,7 @@ name: Django CI
 on:
   push:
     branches:
-      - '*'         # matches every branch that doesn't contain a '/'
-      - '*/*'       # matches every branch containing a single '/'
-      - '**'        # matches every branch
+      - '**'
 
 jobs:
   django-test:
@@ -18,32 +16,33 @@ jobs:
         with:
           python-version: 3.11
 
-      - name: cache poetry install
+      - name: Cache Poetry
         uses: actions/cache@v4
         with:
           path: ~/.local
-          key: poetry-1.2.2-0
+          key: poetry-1.2.2-${{ hashFiles('**/poetry.lock') }}
 
       - uses: snok/install-poetry@v1
         with:
           version: 1.2.2
           virtualenvs-create: true
           virtualenvs-in-project: true
 
-      - name: cache deps
+      - name: Cache dependencies
         id: cache-deps
         uses: actions/cache@v4
         with:
           path: .venv
           key: pydeps-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            pydeps-
 
-      - run: poetry install --no-root
-        if: steps.cache-deps.outputs.cache-hit != 'true'
-
-      # install setuptools
-      - run: poetry run pip install setuptools
+      - name: Install dependencies
+        run: poetry install
 
       - name: Run tests
-        run: poetry run python manage.py test
+        run: poetry run python manage.py test --verbosity=2
         env:
-          DEBUG: True
+          DEBUG: True
+          DJANGO_SETTINGS_MODULE: procollab.settings
+          PYTHONUNBUFFERED: 1

core/admin.py

@@ -3,13 +3,13 @@
 
 from core.models import (
     Like,
-    View,
     Link,
-    Specialization,
-    SpecializationCategory,
     Skill,
     SkillCategory,
     SkillToObject,
+    Specialization,
+    SpecializationCategory,
+    View,
 )
 
 
@@ -69,13 +69,26 @@ class SpecializationAdmin(admin.ModelAdmin):
         "id",
         "name",
         "category",
+        "category_id",
     )
     list_display_links = (
         "id",
         "name",
+        "category_id",
     )
 
 
+class SpecializationInline(admin.TabularInline):
+    model = Specialization
+    extra = 0
+    fields = ("name",)
+    show_change_link = True
+    can_delete = False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+
 @admin.register(SpecializationCategory)
 class SpecializationCategoryAdmin(admin.ModelAdmin):
     list_display = (
@@ -86,6 +99,7 @@ class SpecializationCategoryAdmin(admin.ModelAdmin):
         "id",
         "name",
     )
+    inlines = [SpecializationInline]
 
 
 @admin.register(SkillToObject)