Ticket #8379: r8520-validate-username.patch

django/contrib/auth/admin.py

@@ -1 @@
-
 from django.contrib.auth.models import User, Group
 from django.core.exceptions import PermissionDenied
 from django import template
@@ -7 +6 @@
 from django.utils.html import escape
 from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext, ugettext_lazy as _
-from django.contrib.auth.forms import UserCreationForm, AdminPasswordChangeForm
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AdminPasswordChangeForm
 from django.contrib import admin
 
 class GroupAdmin(admin.ModelAdmin):
@@ -23 +22 @@
         (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
         (_('Groups'), {'fields': ('groups',)}),
     )
+    form = UserChangeForm
     add_form = UserCreationForm
     change_password_form = AdminPasswordChangeForm
     list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')

django/contrib/auth/forms.py

@@ -43 +43 @@
             user.save()
         return user
 
+class UserChangeForm(forms.ModelForm):
+    username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^\w+$',
+        help_text = _("Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."),
+        error_message = _("This value must contain only letters, numbers and underscores."))
+
+    class Meta:
+        model = User
+
 class AuthenticationForm(forms.Form):
     """
     Base class for authenticating users. Extend this to get a form that accepts