allow non-digit chars (e.g. '-') in user IDs in URLs; fixes #565

wagtail/wagtailusers/tests.py

@@ -16,6 +16,8 @@ from wagtail.wagtailcore.models import Page, GroupPagePermission
 
 class TestUserIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
+        # create a user that should be visible in the listing
+        self.test_user = get_user_model().objects.create_user(username='testuser', email='testuser@email.com', password='password')
         self.login()
 
     def get(self, params={}):
@@ -25,6 +27,15 @@ class TestUserIndexView(TestCase, WagtailTestUtils):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailusers/users/index.html')
+        self.assertContains(response, 'testuser')
+
+    def test_allows_negative_ids(self):
+        # see https://github.com/torchbox/wagtail/issues/565
+        get_user_model().objects.create_user('guardian', 'guardian@example.com', 'gu@rd14n', id=-1)
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'testuser')
+        self.assertContains(response, 'guardian')
 
     def test_search(self):
         response = self.get({'q': "Hello"})

wagtail/wagtailusers/urls/users.py

@@ -4,5 +4,5 @@ from wagtail.wagtailusers.views import users
 urlpatterns = [
     url(r'^$', users.index, name='wagtailusers_users_index'),
     url(r'^new/$', users.create, name='wagtailusers_users_create'),
-    url(r'^(\d+)/$', users.edit, name='wagtailusers_users_edit'),
+    url(r'^([^\/]+)/$', users.edit, name='wagtailusers_users_edit'),
 ]