{% trans 'Welkom' %}
{% if login_text %}{{ login_text }}
{% endif %}- + {% if settings.DIGID_ENABLED %} {% render_card direction='horizontal' tinted=True %}
{% link href='digid:login' text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %}
{% endrender_card %}
-
+ {% endif %}
+
{% get_solo 'mozilla_django_oidc_db.OpenIDConnectConfig' as oidc_config %}
{% get_solo 'configurations.SiteConfiguration' as site_config %}
{% if oidc_config.enabled %}
diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py
index f3a64a091c..8818d05d59 100644
--- a/src/open_inwoner/accounts/tests/test_auth.py
+++ b/src/open_inwoner/accounts/tests/test_auth.py
@@ -113,12 +113,7 @@ def test_registration_with_invite(self):
self.assertEqual(invite.invitee, user)
# reverse contact checks
- self.assertEqual(user.contacts.count(), 1)
- reverse_contact = user.contacts.get()
- self.assertEqual(reverse_contact.contact_user, contact.created_by)
- self.assertEqual(reverse_contact.email, contact.created_by.email)
- self.assertEqual(reverse_contact.first_name, contact.created_by.first_name)
- self.assertEqual(reverse_contact.last_name, contact.created_by.last_name)
+ self.assertEqual(user.contacts.count(), 0)
def test_registration_active_user(self):
"""the user should be redirected to the registration complete page"""
@@ -276,12 +271,7 @@ def test_submit_with_invite(self):
self.assertEqual(invite.invitee, user)
# reverse contact checks
- self.assertEqual(user.contacts.count(), 1)
- reverse_contact = user.contacts.get()
- self.assertEqual(reverse_contact.contact_user, contact.created_by)
- self.assertEqual(reverse_contact.email, contact.created_by.email)
- self.assertEqual(reverse_contact.first_name, contact.created_by.first_name)
- self.assertEqual(reverse_contact.last_name, contact.created_by.last_name)
+ self.assertEqual(user.contacts.count(), 0)
def test_submit_not_unique_email(self):
UserFactory.create(email="john@smith.com")
diff --git a/src/open_inwoner/accounts/tests/test_contact_query.py b/src/open_inwoner/accounts/tests/test_contact_query.py
index 679de236aa..5382c7373d 100644
--- a/src/open_inwoner/accounts/tests/test_contact_query.py
+++ b/src/open_inwoner/accounts/tests/test_contact_query.py
@@ -62,9 +62,9 @@ def test_mine_and_reverse_contact(self):
contacts = Contact.objects.get_extended_contacts_for_user(self.me)
- self.assertEqual(contacts.count(), 1)
+ self.assertEqual(contacts.count(), 2)
- extended_contact = contacts.get()
+ extended_contact = contacts.filter(created_by=self.me)[0]
self.assertEqual(extended_contact.id, direct_contact.id)
self.assertEqual(extended_contact.other_user_id, other_user.id)
self.assertFalse(extended_contact.reverse)
diff --git a/src/open_inwoner/accounts/views/contacts.py b/src/open_inwoner/accounts/views/contacts.py
index 4587c47453..6b88159841 100644
--- a/src/open_inwoner/accounts/views/contacts.py
+++ b/src/open_inwoner/accounts/views/contacts.py
@@ -40,7 +40,10 @@ def get_queryset(self):
| Q(contact_user__isnull=True)
)
else:
- base_qs = base_qs.filter(contact_user__contact_type=type_filter)
+ base_qs = base_qs.filter(
+ Q(contact_user__contact_type=type_filter)
+ | Q(created_by__contact_type=type_filter)
+ )
return base_qs
def get_context_data(self, **kwargs):
diff --git a/src/open_inwoner/accounts/views/invite.py b/src/open_inwoner/accounts/views/invite.py
index e06147a516..f87af03adb 100644
--- a/src/open_inwoner/accounts/views/invite.py
+++ b/src/open_inwoner/accounts/views/invite.py
@@ -29,6 +29,9 @@ def form_valid(self, form):
def get_object(self, queryset=None):
invite = super().get_object(queryset)
+ if self.request.user.is_authenticated:
+ raise Http404(_("U bent al ingelogd."))
+
if invite.expired():
self.log_system_action(_("invitation expired"), invite)
raise Http404(_("The invitation was expired"))
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index c0b6f5629a..ade8b60527 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -22,7 +22,7 @@
from open_inwoner.utils.views import LogMixin
from ..forms import ThemesForm, UserForm
-from ..models import Action, User
+from ..models import Action, Contact, User
class MyProfileView(LogMixin, LoginRequiredMixin, BaseBreadcrumbMixin, FormView):
@@ -34,11 +34,6 @@ def crumbs(self):
return [(_("Mijn profiel"), reverse("accounts:my_profile"))]
def get_context_data(self, **kwargs):
- contact_names = [
- f"{contact.first_name} ({contact.get_type_display()})"
- for contact in self.request.user.contacts.all()[:3]
- ]
-
context = super().get_context_data(**kwargs)
today = date.today()
context["anchors"] = [
@@ -46,9 +41,21 @@ def get_context_data(self, **kwargs):
("#overview", _("Persoonlijk overzicht")),
("#files", _("Bestanden")),
]
- context["mentor_contacts"] = self.request.user.contacts.filter(
- contact_user__contact_type=ContactTypeChoices.begeleider
- )
+ # List of names of 'mentor' users that are a contact of me
+ mentor_contacts = [
+ str(c.contact_user.get_full_name())
+ for c in self.request.user.contacts.filter(
+ contact_user__contact_type=ContactTypeChoices.begeleider
+ )
+ ] + [
+ str(c.created_by.get_full_name())
+ for c in Contact.objects.filter(
+ created_by__contact_type=ContactTypeChoices.begeleider,
+ contact_user=self.request.user,
+ )
+ ]
+
+ context["mentor_contacts"] = mentor_contacts
context["next_action"] = (
Action.objects.connected(self.request.user)
.filter(end_date__gte=today, status=StatusChoices.open)
@@ -60,10 +67,22 @@ def get_context_data(self, **kwargs):
context["action_text"] = _(
f"{Action.objects.connected(self.request.user).filter(status=StatusChoices.open).count()} acties staan open."
)
- if self.request.user.contacts.count() > 0:
+ contacts = Contact.objects.get_extended_contacts_for_user(self.request.user)
+ # Invited contacts
+ contact_names = [
+ f"{contact.first_name} ({contact.get_type_display()})"
+ for contact in self.request.user.contacts.all()[:3]
+ ]
+ # Reverse contacts
+ contact_names += [
+ f"{contact.created_by.first_name} ({contact.created_by.get_contact_type_display()})"
+ for contact in self.request.user.assigned_contacts.all()[:3]
+ ]
+
+ if contacts.count() > 0:
context[
"contact_text"
- ] = f"{', '.join(contact_names)}{'...' if self.request.user.contacts.count() > 3 else ''}"
+ ] = f"{', '.join(contact_names)}{'...' if contacts.count() > 3 else ''}"
else:
context["contact_text"] = _("U heeft nog geen contacten.")
context["questionnaire_exists"] = QuestionnaireStep.objects.exists()
diff --git a/src/open_inwoner/accounts/views/registration.py b/src/open_inwoner/accounts/views/registration.py
index 4c1c4daa36..7078e693aa 100644
--- a/src/open_inwoner/accounts/views/registration.py
+++ b/src/open_inwoner/accounts/views/registration.py
@@ -57,20 +57,6 @@ def add_invitee(self, invite, user):
contact.contact_user = user
contact.save()
- # create reverse contact
- reverse_contact, created = Contact.objects.get_or_create(
- contact_user=invite.inviter,
- created_by=user,
- defaults={
- "first_name": invite.inviter.first_name,
- "last_name": invite.inviter.last_name,
- "email": invite.inviter.email,
- },
- )
- if created:
- self.request.user = user
- self.log_user_action(reverse_contact, _("contact was created"))
-
class CustomRegistrationView(LogMixin, InviteMixin, RegistrationView):
form_class = CustomRegistrationForm
diff --git a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html
index e203097c22..593f97a601 100644
--- a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html
+++ b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html
@@ -15,8 +15,6 @@ {% link url text=title %}
{{ object.end_date }}
{% trans "Created by" %}:
{{ object.created_by.get_full_name }}
- {% trans "Contactpersonen" %}:
- {{ object.contactperson_list }}