Changeset 5998
- Timestamp:
- 08/24/07 08:16:01 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/newforms-admin/django/contrib/admin/sites.py
r5627 r5998 10 10 import datetime 11 11 import md5 12 import re 12 13 13 14 ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") 14 15 LOGIN_FORM_KEY = 'this_is_the_login_form' 16 17 USER_CHANGE_PASSWORD_URL_RE = re.compile('auth/user/(\d+)/password') 15 18 16 19 class AlreadyRegistered(Exception): … … 112 115 return self.login(request) 113 116 117 114 118 if url == '': 115 119 return self.index(request) … … 120 124 elif url == 'jsi18n': 121 125 return self.i18n_javascript(request) 122 elif '/' in url: 123 return self.model_page(request, *url.split('/', 2)) 126 else: 127 match = USER_CHANGE_PASSWORD_URL_RE.match(url) 128 if match: 129 return self.user_change_password(request, match.group(1)) 130 131 if '/' in url: 132 return self.model_page(request, *url.split('/', 2)) 124 133 125 134 raise http.Http404('The requested admin page does not exist.') … … 153 162 from django.contrib.auth.views import password_change_done 154 163 return password_change_done(request) 164 165 def user_change_password(self, request, id): 166 """ 167 Handles the "user change password" task 168 """ 169 from django.contrib.admin.views.auth import user_change_password 170 return user_change_password(request, id) 155 171 156 172 def i18n_javascript(self, request):
