Django

Code

Show
Ignore:
Timestamp:
06/21/07 16:36:35 (2 years ago)
Author:
bouldersprinters
Message:

boulder-oracle-sprint: Merged to [5508]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/boulder-oracle-sprint/django/contrib/admin/media/js/admin/RelatedObjectLookups.js

    r3517 r5509  
    3131    var name = triggeringLink.id.replace(/^add_/, ''); 
    3232    name = name.replace(/\./g, '___'); 
    33     var win = window.open(triggeringLink.href + '?_popup=1', name, 'height=500,width=800,resizable=yes,scrollbars=yes'); 
     33    href = triggeringLink.href 
     34    if (href.indexOf('?') == -1) 
     35        href += '?_popup=1'; 
     36    else 
     37        href += '&_popup=1'; 
     38    var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes'); 
    3439    win.focus(); 
    3540    return false; 

  • django/branches/boulder-oracle-sprint/django/contrib/auth/forms.py

    r4695 r5509  
    8080    def isValidUserEmail(self, new_data, all_data): 
    8181        "Validates that a user exists with the given e-mail address" 
    82         try: 
    83             self.user_cache = User.objects.get(email__iexact=new_data) 
    84         except User.DoesNotExist: 
     82        self.users_cache = list(User.objects.filter(email__iexact=new_data)) 
     83        if len(self.users_cache) == 0: 
    8584            raise validators.ValidationError, _("That e-mail address doesn't have an associated user account. Are you sure you've registered?") 
    8685 
    …… 
    8887        "Calculates a new password randomly and sends it to the user" 
    8988        from django.core.mail import send_mail 
    90         new_pass = User.objects.make_random_password() 
    91         self.user_cache.set_password(new_pass) 
    92         self.user_cache.save() 
    93         if not domain_override: 
    94             current_site = Site.objects.get_current() 
    95             site_name = current_site.name 
    96             domain = current_site.domain 
    97         else: 
    98             site_name = domain = domain_override 
    99         t = loader.get_template(email_template_name) 
    100         c = { 
    101             'new_password': new_pass, 
    102             'email': self.user_cache.email, 
    103             'domain': domain, 
    104             'site_name': site_name, 
    105             'user': self.user_cache, 
    106         } 
    107         send_mail('Password reset on %s' % site_name, t.render(Context(c)), None, [self.user_cache.email]) 
     89        for user in self.users_cache: 
     90            new_pass = User.objects.make_random_password() 
     91            user.set_password(new_pass) 
     92            user.save() 
     93            if not domain_override: 
     94                current_site = Site.objects.get_current() 
     95                site_name = current_site.name 
     96                domain = current_site.domain 
     97            else: 
     98                site_name = domain = domain_override 
     99            t = loader.get_template(email_template_name) 
     100            c = { 
     101                'new_password': new_pass, 
     102                'email': user.email, 
     103                'domain': domain, 
     104                'site_name': site_name, 
     105                'user': user, 
     106                } 
     107            send_mail('Password reset on %s' % site_name, t.render(Context(c)), None, [user.email]) 
    108108 
    109109class PasswordChangeForm(oldforms.Manipulator): 

  • django/branches/boulder-oracle-sprint/django/contrib/databrowse/templates/databrowse/object_detail.html

    r5014 r5509  
    3333    {% endfor %} 
    3434  </ul> 
    35   </div> 
    3635  {% else %} 
    3736  <p class="quiet">(None)</p> 
    3837  {% endif %} 
     38  </div> 
    3939{% endfor %} 
    4040 

  • django/branches/boulder-oracle-sprint/django/contrib/redirects/middleware.py

    r4279 r5509  
    2020                pass 
    2121        if r is not None: 
    22             if r == '': 
     22            if r.new_path == '': 
    2323                return http.HttpResponseGone() 
    2424            return http.HttpResponsePermanentRedirect(r.new_path) 

  • django/branches/boulder-oracle-sprint/django/core/servers/basehttp.py

    r5491 r5509  
    1010from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer 
    1111from types import ListType, StringType 
    12 import os, re, sys, time, urllib 
     12import os, re, sys, time, urllib, mimetypes 
    1313 
    1414__version__ = "0.1" 
    …… 
    630630                status = '200 OK' 
    631631                headers = {} 
     632                mime_type = mimetypes.guess_type(file_path)[0] 
     633                if mime_type: 
     634                    headers['Content-Type'] = mime_type 
    632635                output = [fp.read()] 
    633636                fp.close()