Merge branch 'feature/country-to-account-page' into develop

szabozoltan69 · szabozoltan69 · commit 23490b9b1375 · 2026-01-20T14:07:07.000+01:00
diff --git a/api/serializers.py b/api/serializers.py
@@ -1701,12 +1701,14 @@ def validate_document(self, document):
 
 
 class ProfileSerializer(ModelSerializer):
-    country = MiniCountrySerializer()
+    country = serializers.PrimaryKeyRelatedField(queryset=Country.objects.all())
+    country_details = MiniCountrySerializer(source="country", read_only=True)
 
     class Meta:
         model = Profile
         fields = (
             "country",
+            "country_details",
             "org",
             "org_type",
             "city",
diff --git a/assets b/assets
@@ -1 +1 @@
-Subproject commit d9cd340791821067d36e2f2d492bc83e0eab9a6a
+Subproject commit 55970a43082bc03dbd6862028bd4b026e76ace45
diff --git a/notifications/admin.py b/notifications/admin.py
@@ -28,7 +28,7 @@ def std(self, obj):
 
 
 class SubscriptionAdmin(CompareVersionAdmin):
-    search_fields = ("user__username", "rtype")
+    search_fields = ("user__email", "user__username", "rtype")
     list_filter = (("rtype", ChoiceDropdownFilter),)
 
     def get_queryset(self, request):
