Merge branch 'better-friendship-view' into 'main'

Rework of the friendships page

See merge request bde/nk20!220

apps/note/api/serializers.py

@@ -11,6 +11,7 @@ from member.models import Membership
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend
 from rest_framework.utils import model_meta
+from rest_framework.validators import UniqueTogetherValidator
 
 from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, Trust
 from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \
@@ -86,11 +87,9 @@ class TrustSerializer(serializers.ModelSerializer):
     class Meta:
         model = Trust
         fields = '__all__'
-
-    def validate(self, attrs):
-        instance = Trust(**attrs)
-        instance.clean()
-        return attrs
+        validators = [UniqueTogetherValidator(
+            queryset=Trust.objects.all(), fields=('trusting', 'trusted'),
+            message=_("This friendship already exists"))]
 
 
 class AliasSerializer(serializers.ModelSerializer):

locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-01 18:01+0200\n"
+"POT-Creation-Date: 2023-09-18 17:27+0200\n"
 "PO-Revision-Date: 2020-11-16 20:02+0000\n"
 "Last-Translator: bleizi <bleizi@crans.org>\n"
 "Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20/de/>\n"
@@ -1300,7 +1300,13 @@ msgstr "Empfänger"
 msgid "amount"
 msgstr "Anzahl"
 
-#: apps/note/api/serializers.py:199 apps/note/api/serializers.py:205
+#: apps/note/api/serializers.py:92
+#, fuzzy
+#| msgid "This credit is already validated."
+msgid "This friendship already exists"
+msgstr "Dieser Kredit ist bereits validiert."
+
+#: apps/note/api/serializers.py:198 apps/note/api/serializers.py:204
 #: apps/note/models/transactions.py:228
 msgid ""
 "The transaction can't be saved since the source note or the destination note "

locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-01 18:01+0200\n"
+"POT-Creation-Date: 2023-09-18 17:27+0200\n"
 "PO-Revision-Date: 2022-04-11 23:12+0200\n"
 "Last-Translator: bleizi <bleizi@crans.org>\n"
 "Language-Team: \n"
@@ -1286,7 +1286,13 @@ msgstr "destino"
 msgid "amount"
 msgstr "monto"
 
-#: apps/note/api/serializers.py:199 apps/note/api/serializers.py:205
+#: apps/note/api/serializers.py:92
+#, fuzzy
+#| msgid "This credit is already validated."
+msgid "This friendship already exists"
+msgstr "Este crédito ya fue validado."
+
+#: apps/note/api/serializers.py:198 apps/note/api/serializers.py:204
 #: apps/note/models/transactions.py:228
 msgid ""
 "The transaction can't be saved since the source note or the destination note "
@@ -3573,6 +3579,11 @@ msgstr ""
 "pagar su afiliación. Tambien tiene que validar su correo electronico con el "
 "enlace que recibió."
 
+#, fuzzy
+#~| msgid "People having you as a friend"
+#~ msgid "You already have that person as a friend"
+#~ msgstr "Personas que tienen usted como amig@"
+
 #~ msgid ""
 #~ "I declare that I opened or I will open soon a bank account in the Société "
 #~ "générale with the BDE partnership."

locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-01 18:01+0200\n"
+"POT-Creation-Date: 2023-09-18 17:27+0200\n"
 "PO-Revision-Date: 2022-04-11 22:05+0200\n"
 "Last-Translator: bleizi <bleizi@crans.org>\n"
 "Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
@@ -1288,7 +1288,11 @@ msgstr "destination"
 msgid "amount"
 msgstr "montant"
 
-#: apps/note/api/serializers.py:199 apps/note/api/serializers.py:205
+#: apps/note/api/serializers.py:92
+msgid "This friendship already exists"
+msgstr "Cette amitié existe déjà"
+
+#: apps/note/api/serializers.py:198 apps/note/api/serializers.py:204
 #: apps/note/models/transactions.py:228
 msgid ""
 "The transaction can't be saved since the source note or the destination note "
@@ -3600,6 +3604,11 @@ msgstr ""
 "d'adhésion. Vous devez également valider votre adresse email en suivant le "
 "lien que vous avez reçu."
 
+#, fuzzy
+#~| msgid "People having you as a friend"
+#~ msgid "You already have that person as a friend"
+#~ msgstr "Personnes vous ayant ajouté"
+
 #~ msgid ""
 #~ "I declare that I opened or I will open soon a bank account in the Société "
 #~ "générale with the BDE partnership."

locale/fr/LC_MESSAGES/djangojs.po

@@ -27,7 +27,7 @@ msgstr "Alias supprimé avec succès"
 
 #: apps/member/static/member/js/trust.js:14
 msgid "You can't add yourself as a friend"
-msgstr ""
+msgstr "Vous ne pouvez pas vous ajouter vous-même en ami"
 
 #: apps/member/static/member/js/trust.js:37
 msgid "Friendship successfully added"