From 608526b3483f1e3192b0b3818684bd4efcf7f430 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Thu, 10 Apr 2025 18:04:13 +0200 Subject: [PATCH] small fixes --- cookbook/serializer.py | 4 +- cookbook/templates/account/email.html | 7 -- .../templates/account/password_change.html | 6 -- cookbook/templates/account/password_set.html | 6 -- cookbook/templates/settings.html | 6 -- .../templates/socialaccount/connections.html | 8 -- .../tests/api/docs/reports/tests/pytest.xml | 2 +- .../tests/api/docs/reports/tests/tests.html | 6 +- cookbook/tests/api/test_api_user.py | 16 ++++ recipes/settings.py | 1 - .../dialogs/AddToShoppingDialog.vue | 39 ++++++---- .../components/inputs/NumberScalerDialog.vue | 5 +- .../components/settings/AccountSettings.vue | 2 + vue3/src/locales/ar.json | 1 + vue3/src/locales/bg.json | 1 + vue3/src/locales/ca.json | 1 + vue3/src/locales/cs.json | 1 + vue3/src/locales/da.json | 1 + vue3/src/locales/de.json | 1 + vue3/src/locales/el.json | 1 + vue3/src/locales/en.json | 1 + vue3/src/locales/es.json | 1 + vue3/src/locales/fi.json | 1 + vue3/src/locales/fr.json | 1 + vue3/src/locales/he.json | 1 + vue3/src/locales/hu.json | 1 + vue3/src/locales/hy.json | 1 + vue3/src/locales/id.json | 1 + vue3/src/locales/is.json | 1 + vue3/src/locales/it.json | 1 + vue3/src/locales/lt.json | 1 + vue3/src/locales/nb_NO.json | 1 + vue3/src/locales/nl.json | 1 + vue3/src/locales/pl.json | 1 + vue3/src/locales/pt.json | 1 + vue3/src/locales/pt_BR.json | 1 + vue3/src/locales/ro.json | 1 + vue3/src/locales/ru.json | 1 + vue3/src/locales/sl.json | 1 + vue3/src/locales/sv.json | 1 + vue3/src/locales/tr.json | 1 + vue3/src/locales/uk.json | 1 + vue3/src/locales/zh_Hans.json | 1 + vue3/src/locales/zh_Hant.json | 1 + vue3/src/pages/StartPage.vue | 3 +- vue3/src/stores/UserPreferenceStore.ts | 2 + vue3/src/types/settings.ts | 2 + vue3/yarn.lock | 73 ------------------- 48 files changed, 87 insertions(+), 132 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 239725e95..dc17c0b4a 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -201,7 +201,7 @@ class UserSerializer(WritableNestedModelSerializer): list_serializer_class = SpaceFilterSerializer model = User fields = ('id', 'username', 'first_name', 'last_name', 'display_name', 'is_staff', 'is_superuser', 'is_active') - read_only_fields = ('username',) + read_only_fields = ('id', 'username', 'display_name', 'is_staff', 'is_superuser', 'is_active') class GroupSerializer(UniqueFieldsMixin, WritableNestedModelSerializer): @@ -214,6 +214,7 @@ class GroupSerializer(UniqueFieldsMixin, WritableNestedModelSerializer): class Meta: model = Group fields = ('id', 'name') + read_only_fields = ('id', 'name') class FoodInheritFieldSerializer(UniqueFieldsMixin, WritableNestedModelSerializer): @@ -1514,6 +1515,7 @@ class FdcQuerySerializer(serializers.Serializer): totalPages = serializers.IntegerField() foods = FdcQueryFoodsSerializer(many=True) + # Export/Import Serializers class KeywordExportSerializer(KeywordSerializer): diff --git a/cookbook/templates/account/email.html b/cookbook/templates/account/email.html index fcbc8768d..d924fe0cd 100644 --- a/cookbook/templates/account/email.html +++ b/cookbook/templates/account/email.html @@ -7,13 +7,6 @@ {% block content %} - -

{% trans "E-mail Addresses" %}

{% if user.emailaddress_set.all %}

{% trans 'The following e-mail addresses are associated with your account:' %}

diff --git a/cookbook/templates/account/password_change.html b/cookbook/templates/account/password_change.html index b5d56e2a9..557dbccd8 100644 --- a/cookbook/templates/account/password_change.html +++ b/cookbook/templates/account/password_change.html @@ -6,12 +6,6 @@ {% block head_title %}{% trans "Change Password" %}{% endblock %} {% block content %} -

{% trans "Change Password" %}

diff --git a/cookbook/templates/account/password_set.html b/cookbook/templates/account/password_set.html index a145ba550..03e3b2bc5 100644 --- a/cookbook/templates/account/password_set.html +++ b/cookbook/templates/account/password_set.html @@ -6,12 +6,6 @@ {% block head_title %}{% trans "Set Password" %}{% endblock %} {% block content %} -

{% trans "Set Password" %}

diff --git a/cookbook/templates/settings.html b/cookbook/templates/settings.html index 0db62da9a..8171c40cd 100644 --- a/cookbook/templates/settings.html +++ b/cookbook/templates/settings.html @@ -12,12 +12,6 @@ {% block content %} -