From 0f38b2736255eb0e172782f90d379abbe0c9eaf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 15:35:04 +0200 Subject: [PATCH] Update django-invitations requirement from <1.9.4 to <2.0.1 (#10084) * Update django-invitations requirement from <1.9.4 to <2.0.1 Updates the requirements on [django-invitations](https://github.com/jazzband/django-invitations) to permit the latest version. - [Release notes](https://github.com/jazzband/django-invitations/releases) - [Changelog](https://github.com/jazzband/django-invitations/blob/master/CHANGELOG.md) - [Commits](https://github.com/jazzband/django-invitations/compare/0.1...2.0.0) --- updated-dependencies: - dependency-name: django-invitations dependency-type: direct:production ... Signed-off-by: dependabot[bot] * - fix the adapter Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: afabiani --- geonode/people/adapters.py | 6 +++++- geonode/settings.py | 2 +- requirements.txt | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/geonode/people/adapters.py b/geonode/people/adapters.py index 3a06739d7f3..afda5d0fd2a 100644 --- a/geonode/people/adapters.py +++ b/geonode/people/adapters.py @@ -131,8 +131,12 @@ def populate_username(self, request, user): user_username(user, safe_username) def send_invitation_email(self, email_template, email, context): + self.send_mail(email_template, email, context) + + def send_mail(self, template_prefix, email, context): enh_context = self.enhanced_invitation_context(context) - self.send_mail(email_template, email, enh_context) + msg = self.render_mail(template_prefix, email, enh_context) + msg.send() def enhanced_invitation_context(self, context): user = context.get("inviter") if context.get("inviter") else context.get("user") diff --git a/geonode/settings.py b/geonode/settings.py index ded3d6e80b8..9e3aa69fbd4 100644 --- a/geonode/settings.py +++ b/geonode/settings.py @@ -1990,7 +1990,7 @@ def get_geonode_catalogue_service(): } INVITATIONS_ADAPTER = ACCOUNT_ADAPTER - +INVITATIONS_CONFIRMATION_URL_NAME = "geonode.invitations:accept-invite" # Choose thumbnail generator -- this is the default generator THUMBNAIL_GENERATOR = os.environ.get( diff --git a/requirements.txt b/requirements.txt index fe73b0415af..73f84b8b313 100644 --- a/requirements.txt +++ b/requirements.txt @@ -69,7 +69,7 @@ django-select2==7.10.1 django-floppyforms<1.10.0 django-forms-bootstrap<=3.1.0 django-autocomplete-light==3.5.1 -django-invitations<1.9.4 +django-invitations<2.0.1 django-recaptcha==3.0.0 # REST