Make invitation editable on creation of student profile (#910)

cscenter · Nov 11, 2024 · a136528 · a136528
1 parent d5920bb
commit a136528
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 104 deletions.
diff --git a/apps/admission/locale/ru/LC_MESSAGES/django.po b/apps/admission/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-10 12:50+0000\n"
+"POT-Creation-Date: 2024-11-11 10:13+0000\n"
 "PO-Revision-Date: 2024-07-23 17:04+0000\n"
 "Last-Translator: Дмитрий Чернушевич <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/apps/htmlpages/locale/ru/LC_MESSAGES/django.po b/apps/htmlpages/locale/ru/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-10 12:50+0000\n"
+"POT-Creation-Date: 2024-11-11 10:13+0000\n"
 "PO-Revision-Date: 2015-03-18 08:34+0000\n"
 "Last-Translator: Jannis Leidel <[email protected]>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"

diff --git a/apps/learning/admin.py b/apps/learning/admin.py
@@ -351,6 +351,7 @@ class CourseInlineAdmin(admin.TabularInline):
 
 
 class InvitationAdmin(BaseModelAdmin):
+    search_fields = ['name']
     list_display = ('name', 'get_branches', 'semester', 'get_link')
     list_select_related = ['semester']
     list_prefetch_related = ['branches']

diff --git a/apps/projects/locale/ru/LC_MESSAGES/django.po b/apps/projects/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-10 12:50+0000\n"
+"POT-Creation-Date: 2024-11-11 10:13+0000\n"
 "PO-Revision-Date: 2022-02-21 15:24+0000\n"
 "Last-Translator: Сергей Жеревчук <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/apps/surveys/locale/ru/LC_MESSAGES/django.po b/apps/surveys/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-10 12:50+0000\n"
+"POT-Creation-Date: 2024-11-11 10:13+0000\n"
 "PO-Revision-Date: 2019-10-31 16:30+0000\n"
 "Last-Translator: b'  <[email protected]>'\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/apps/users/admin.py b/apps/users/admin.py
@@ -194,6 +194,7 @@ class Meta:
     def clean(self):
         cleaned_data = super().clean()
         profile_type = cleaned_data.get('type')
+        invitation = cleaned_data.get('invitation')
         user = cleaned_data.get('user')
         branch = cleaned_data.get('branch')
         year_of_admission = cleaned_data.get('year_of_admission')
@@ -209,6 +210,9 @@ def clean(self):
                     msg = _('Regular student profile already exists for this '
                             'admission campaign year.')
                     self.add_error('year_of_admission', ValidationError(msg))
+        if profile_type == StudentTypes.INVITED and invitation is None:
+            msg = _('Student profile with type INVITED must have invitation')
+            self.add_error('invitation', ValidationError(msg))
 
 
 class StudentProfileAdmin(BaseModelAdmin):
@@ -218,6 +222,7 @@ class StudentProfileAdmin(BaseModelAdmin):
     list_filter = ('type', 'site', 'branch', 'status',)
     raw_id_fields = ('user', 'comment_last_author')
     search_fields = ['user__last_name']
+    raw_id_fields = ['invitation']
     inlines = [StudentStatusLogAdminInline, StudentAcademicDisciplineLogAdminInline]
     formfield_overrides = {
         models.ManyToManyField: {
@@ -230,7 +235,7 @@ def get_readonly_fields(self, request, obj=None):
             # TODO: add user change url
             return ['type', 'site', 'year_of_admission', 'birth_date',
                     'comment_changed_at', 'comment_last_author', 'invitation']
-        return ['birth_date', 'invitation']
+        return ['birth_date']
 
     def get_fieldsets(self, request, obj=None):
         fieldsets = [

diff --git a/apps/users/models.py b/apps/users/models.py
@@ -913,7 +913,6 @@ class StudentProfile(TimeStampedModel):
     invitation = models.ForeignKey(
         "learning.Invitation",
         verbose_name=_("Invitation"),
-        editable=False,
         blank=True, null=True,
         related_name="student_profiles",
         on_delete=models.SET_NULL)

diff --git a/compscicenter_ru/locale/ru/LC_MESSAGES/django.po b/compscicenter_ru/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-10 12:50+0000\n"
+"POT-Creation-Date: 2024-11-11 10:13+0000\n"
 "PO-Revision-Date: 2020-02-03 16:52+0000\n"
 "Last-Translator: b'  <[email protected]>'\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/compsciclub_ru/locale/ru/LC_MESSAGES/django.po b/compsciclub_ru/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-10 12:50+0000\n"
+"POT-Creation-Date: 2024-11-11 10:13+0000\n"
 "PO-Revision-Date: 2020-09-09 04:43+0000\n"
 "Last-Translator: b'  <[email protected]>'\n"
 "Language-Team: LANGUAGE <[email protected]>\n"