From 913e89690666a1c9203576500ee78f9bc5cd25ba Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 5 Jun 2021 19:01:05 +0200 Subject: [PATCH] fixed invite link system --- cookbook/tables.py | 6 +++--- cookbook/views/new.py | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cookbook/tables.py b/cookbook/tables.py index 57ad6967b..395f5f9c5 100644 --- a/cookbook/tables.py +++ b/cookbook/tables.py @@ -143,9 +143,9 @@ class InviteLinkTable(tables.Table): link = tables.TemplateColumn( "" + _('Link') + "" ) - delete = tables.TemplateColumn( - "" + _('Delete') + "" # noqa: E501 - ) + # delete = tables.TemplateColumn( + # "" + _('Delete') + "" + # ) class Meta: model = InviteLink diff --git a/cookbook/views/new.py b/cookbook/views/new.py index d037044d6..57bea340c 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -227,7 +227,7 @@ class InviteLinkCreate(GroupRequiredMixin, CreateView): message += _(' to join their Tandoor Recipes space ') + escape(self.request.space.name) + '.\n\n' message += _('Click the following link to activate your account: ') + self.request.build_absolute_uri(reverse('view_signup', args=[str(obj.uuid)])) + '\n\n' message += _('If the link does not work use the following code to manually join the space: ') + str(obj.uuid) + '\n\n' - message += _('The invitation is valid until ') + obj.valid_until + '\n\n' + message += _('The invitation is valid until ') + str(obj.valid_until) + '\n\n' message += _('Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub ') + 'https://github.com/vabene1111/recipes/' send_mail( @@ -236,7 +236,6 @@ class InviteLinkCreate(GroupRequiredMixin, CreateView): None, [obj.email], fail_silently=False, - ) messages.add_message(self.request, messages.SUCCESS, _('Invite link successfully send to user.')) @@ -246,7 +245,7 @@ class InviteLinkCreate(GroupRequiredMixin, CreateView): except (SMTPException, BadHeaderError, TimeoutError): messages.add_message(self.request, messages.ERROR, _('Email to user could not be send, please share link manually.')) - return HttpResponseRedirect(reverse('list_invite_link')) + return HttpResponseRedirect(reverse('index')) def get_context_data(self, **kwargs): context = super(InviteLinkCreate, self).get_context_data(**kwargs)