From 651f429ffb0c32bcdd0233443f61f1e88f284da1 Mon Sep 17 00:00:00 2001
From: Sohalt <sohalt@sohalt.net>
Date: Tue, 16 Apr 2019 16:39:31 +0200
Subject: [PATCH] Fix #1247 -- Allow team invites to be resent (#1250)

* Fix #1247 -- Allow team invites to be resent

* Test resending invalid invites

* Fix tooltip

* Fix test

* Handle invalid types for pk parameter

* Style button
---
 src/pretix/control/logdisplay.py              |  3 ++
 .../organizers/team_members.html              |  5 ++++
 src/pretix/control/views/organizer.py         | 22 ++++++++++++--
 src/pretix/static/pretixbase/scss/_theme.scss |  5 ++++
 src/tests/control/test_teams.py               | 29 +++++++++++++++++++
 5 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py
index 43d564cc9..cf96a3e28 100644
--- a/src/pretix/control/logdisplay.py
+++ b/src/pretix/control/logdisplay.py
@@ -389,6 +389,9 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
     if logentry.action_type == 'pretix.team.invite.created':
         return _('{user} has been invited to the team.').format(user=data.get('email'))
 
+    if logentry.action_type == 'pretix.team.invite.resent':
+        return _('Invite for {user} has been resent.').format(user=data.get('email'))
+
     if logentry.action_type == 'pretix.team.invite.deleted':
         return _('The invite for {user} has been revoked.').format(user=data.get('email'))
 
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/team_members.html b/src/pretix/control/templates/pretixcontrol/organizers/team_members.html
index eb24412bf..080ad3cb7 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/team_members.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/team_members.html
@@ -51,6 +51,11 @@
                         {{ i.email }}
                         <span class="fa fa-envelope-o" data-toggle="tooltip"
                               title="{% trans "invited, pending response" %}"></span>
+                        <button type="submit" name="resend-invite" value="{{ i.id }}"
+                                data-toggle="tooltip" title="{% trans "resend invite" %}"
+                                class="btn-invisible">
+                            <span class="fa fa-repeat"></span>
+                        </button>
                     </td>
                     <td class="text-right">
                         <button type="submit" name="remove-invite" value="{{ i.id }}"
diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py
index 985e9abaf..6be40eaac 100644
--- a/src/pretix/control/views/organizer.py
+++ b/src/pretix/control/views/organizer.py
@@ -518,7 +518,7 @@ class TeamMemberView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
         if 'remove-member' in request.POST:
             try:
                 user = User.objects.get(pk=request.POST.get('remove-member'))
-            except User.DoesNotExist:
+            except (User.DoesNotExist, ValueError):
                 pass
             else:
                 other_admin_teams = self.request.organizer.teams.exclude(pk=self.object.pk).filter(
@@ -542,7 +542,7 @@ class TeamMemberView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
         elif 'remove-invite' in request.POST:
             try:
                 invite = self.object.invites.get(pk=request.POST.get('remove-invite'))
-            except TeamInvite.DoesNotExist:
+            except (TeamInvite.DoesNotExist, ValueError):
                 messages.error(self.request, _('Invalid invite selected.'))
                 return redirect(self.get_success_url())
             else:
@@ -555,10 +555,26 @@ class TeamMemberView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
                 messages.success(self.request, _('The invite has been revoked.'))
                 return redirect(self.get_success_url())
 
+        elif 'resend-invite' in request.POST:
+            try:
+                invite = self.object.invites.get(pk=request.POST.get('resend-invite'))
+            except (TeamInvite.DoesNotExist, ValueError):
+                messages.error(self.request, _('Invalid invite selected.'))
+                return redirect(self.get_success_url())
+            else:
+                self._send_invite(invite)
+                self.object.log_action(
+                    'pretix.team.invite.resent', user=self.request.user, data={
+                        'email': invite.email
+                    }
+                )
+                messages.success(self.request, _('The invite has been resent.'))
+                return redirect(self.get_success_url())
+
         elif 'remove-token' in request.POST:
             try:
                 token = self.object.tokens.get(pk=request.POST.get('remove-token'))
-            except TeamAPIToken.DoesNotExist:
+            except (TeamAPIToken.DoesNotExist, ValueError):
                 messages.error(self.request, _('Invalid token selected.'))
                 return redirect(self.get_success_url())
             else:
diff --git a/src/pretix/static/pretixbase/scss/_theme.scss b/src/pretix/static/pretixbase/scss/_theme.scss
index f0f3d313f..02b94208e 100644
--- a/src/pretix/static/pretixbase/scss/_theme.scss
+++ b/src/pretix/static/pretixbase/scss/_theme.scss
@@ -74,6 +74,11 @@
   outline: 0;
 }
 
+.btn-invisible {
+  background: transparent;
+  border: transparent;
+}
+
 .alert-primary, .alert-warning, .alert-info, .alert-success, .alert-danger {
   color: #3b3b3b;
 }
diff --git a/src/tests/control/test_teams.py b/src/tests/control/test_teams.py
index d243175cd..398b5664a 100644
--- a/src/tests/control/test_teams.py
+++ b/src/tests/control/test_teams.py
@@ -103,6 +103,21 @@ def test_team_remove_token(event, admin_user, admin_team, client):
     assert not tk.active
 
 
+@pytest.mark.django_db
+def test_team_resend_invite(event, admin_user, admin_team, client):
+    client.login(email='dummy@dummy.dummy', password='dummy')
+    djmail.outbox = []
+
+    inv = admin_team.invites.create(email='foo@example.org')
+    resp = client.post('/control/organizer/dummy/team/{}/'.format(admin_team.pk), {
+        'resend-invite': str(inv.pk)
+    }, follow=True)
+    assert 'Admin team' in resp.rendered_content
+    assert admin_user.email in resp.rendered_content
+    assert 'foo@example.org' in resp.rendered_content
+    assert len(djmail.outbox) == 1
+
+
 @pytest.mark.django_db
 def test_team_revoke_invite(event, admin_user, admin_team, client):
     client.login(email='dummy@dummy.dummy', password='dummy')
@@ -225,6 +240,20 @@ def test_remove_last_admin_team(event, admin_user, admin_team, client):
     assert 'alert-danger' in resp.rendered_content
 
 
+@pytest.mark.django_db
+def test_resend_invalid_invite(event, admin_user, admin_team, client):
+    client.login(email='dummy@dummy.dummy', password='dummy')
+    djmail.outbox = []
+
+    inv = admin_team.invites.create(email='foo@example.org')
+    resp = client.post('/control/organizer/dummy/team/{}/'.format(admin_team.pk), {
+        'resend-invite': inv.pk + 1
+    }, follow=True)
+    assert b'alert-danger' in resp.content
+    assert b'Invalid invite selected.' in resp.content
+    assert len(djmail.outbox) == 0
+
+
 @pytest.mark.django_db
 def test_invite_invalid_token(event, admin_team, client):
     i = admin_team.invites.create(email='foo@bar.com')