diff --git a/evap/staff/templates/staff_user_merge.html b/evap/staff/templates/staff_user_merge.html index b6236e8f1d..6f765ebc78 100644 --- a/evap/staff/templates/staff_user_merge.html +++ b/evap/staff/templates/staff_user_merge.html @@ -10,7 +10,12 @@ {% block content %} {{ block.super }} -

{% trans 'Merge users' %}

+
+

{% trans 'Merge users' %}

+
+ {% trans 'Swap users' %} +
+
diff --git a/evap/staff/tests/test_views.py b/evap/staff/tests/test_views.py index cf6398606c..7c50ac582c 100644 --- a/evap/staff/tests/test_views.py +++ b/evap/staff/tests/test_views.py @@ -319,6 +319,10 @@ def test_shows_evaluations_voted_for(self): "in the column of the voter and in the column of the merged data", ) + def test_shows_swap_users_option(self): + page = self.app.get(self.url, user=self.manager) + self.assertContains(page, f"/staff/user/{self.other_user.pk}/merge/{self.main_user.pk}") + class TestUserBulkUpdateView(WebTestStaffMode): url = "/staff/user/bulk_update"