Django

Code

Changeset 3613

Show
Ignore:
Timestamp:
08/18/06 16:39:29 (2 years ago)
Author:
adrian
Message:

Fixed bug in [3553] -- Changed admin JavaScript? quoting for related-object popup window not to use repr(), because that produces values such as 123L for longints. Refs #2500

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/views/main.py

    r3601 r3613  
    264264                return HttpResponseRedirect(post_url_continue % pk_value) 
    265265            if request.POST.has_key("_popup"): 
    266                 return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %r, "%s");</script>' % \ 
     266                if type(pk_value) is str: # Quote if string, so JavaScript doesn't think it's a variable. 
     267                    pk_value = '"%s"' % pk_value.replace('"', '\\"') 
     268                return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \ 
    267269                    (pk_value, str(new_object).replace('"', '\\"'))) 
    268270            elif request.POST.has_key("_addanother"): 
    …… 
    721723            else: 
    722724                return "%s__icontains" % field_name 
    723              
     725 
    724726        if self.lookup_opts.admin.search_fields and self.query: 
    725727            for bit in self.query.split():