Merge lp:~rvb/maas/accounts-view-patterns-1.2 into lp:maas/1.2

[Raphaël Badin]

Backport revision 1451.

[Raphaël Badin (rvb)]

Simple backport, self-approving.

review: Approve

=== modified file 'src/maasserver/tests/test_views_settings.py'
--- src/maasserver/tests/test_views_settings.py	2012-10-30 10:25:12 +0000
+++ src/maasserver/tests/test_views_settings.py	2013-03-07 15:42:22 +0000
@@ -334,3 +334,10 @@
         content_text = doc.cssselect('#content')[0].text_content()
         self.assertIn(user.username, content_text)
         self.assertIn(user.email, content_text)
+
+    def test_account_views_are_routable_for_full_range_of_usernames(self):
+        # Usernames can include characters in the regex [\w.@+-].
+        user = factory.make_user(username="[e-mail]")
+        for view in "edit", "view", "del":
+            path = reverse("accounts-%s" % view, args=[user.username])
+            self.assertIsInstance(path, (str, unicode))

=== modified file 'src/maasserver/urls.py'
--- src/maasserver/urls.py	2013-02-11 08:23:10 +0000
+++ src/maasserver/urls.py	2013-03-07 15:42:22 +0000
@@ -162,13 +162,13 @@
         name='settings-add-archive'),
     adminurl(r'^accounts/add/$', AccountsAdd.as_view(), name='accounts-add'),
     adminurl(
-        r'^accounts/(?P<username>\w+)/edit/$', AccountsEdit.as_view(),
+        r'^accounts/(?P<username>[^/]+)/edit/$', AccountsEdit.as_view(),
         name='accounts-edit'),
     adminurl(
-        r'^accounts/(?P<username>\w+)/view/$', AccountsView.as_view(),
+        r'^accounts/(?P<username>[^/]+)/view/$', AccountsView.as_view(),
         name='accounts-view'),
     adminurl(
-        r'^accounts/(?P<username>\w+)/del/$', AccountsDelete.as_view(),
+        r'^accounts/(?P<username>[^/]+)/del/$', AccountsDelete.as_view(),
         name='accounts-del'),
 )