Changeset 3520

Timestamp:

08/03/06 23:18:12 (2 years ago)

Author:

adrian

Message:

Fixed #61 -- No more editing hashes when creating users via the admin. Created a special-case 'Add user' admin view. The change form still displays the hash, for the moment.

Files:

• django/trunk/django/contrib/admin/templates/admin/auth (added)
• django/trunk/django/contrib/admin/templates/admin/auth/user (added)
• django/trunk/django/contrib/admin/templates/admin/auth/user/add_form.html (added)
• django/trunk/django/contrib/admin/urls.py (modified) (1 diff)
• django/trunk/django/contrib/admin/views/auth.py (added)
• django/trunk/django/contrib/auth/forms.py (modified) (1 diff)

django/trunk/django/contrib/admin/urls.py

@@ -29 +29 @@
-    ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'),
-
+    # "Add user" -- a special-case view
+    ('^auth/user/add/$', 'django.contrib.admin.views.auth.user_add_stage'),
+
-    # Add/change/delete/history
-    ('^([^/]+)/([^/]+)/$', 'django.contrib.admin.views.main.change_list'),

django/trunk/django/contrib/auth/forms.py

@@ -5 +5 @@
-from django.core import validators
-from django import forms
+
+class UserCreationForm(forms.Manipulator):
+    "A form that creates a user, with no privileges, from the given username and password."
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name='username', length=30, maxlength=30, is_required=True,
+                validator_list=[validators.isAlphaNumeric, self.isValidUsername]),
+            forms.PasswordField(field_name='password1', length=30, maxlength=60, is_required=True),
+            forms.PasswordField(field_name='password2', length=30, maxlength=60, is_required=True,
+                validator_list=[validators.AlwaysMatchesOtherField('password1', "The two password fields didn't match.")]),
+        )
+
+    def isValidUsername(self, field_data, all_data):
+        try:
+            User.objects.get(username=field_data)
+        except User.DoesNotExist:
+            return
+        raise validators.ValidationError, 'A user with that username already exists.'
+
+    def save(self, new_data):
+        "Creates the user."
+        return User.objects.create_user(new_data['username'], '', new_data['password1'])
-
-class AuthenticationForm(forms.Manipulator):