Strona główna Odkrywaj Pomoc
Zaloguj się
CityApper
/
django
kopia lustrzana https://github.com/django/django
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

Fixed #5704 - Admin popup windows won't close when using application/xhtml as default content type

Thanks to Rob van der Linde for the report, and to mb0, dArignac and claudep
for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Luke Plant 13 lat temu
rodzic
a97ecfdea8
commit
6d39cb4119
2 zmienionych plików z 6 dodań i 3 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 3 1
      django/contrib/admin/options.py
  2. 3 2
      django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js

+ 3 - 1
django/contrib/admin/options.py
Wyświetl plik 

@@ -779,7 +779,9 @@ class ModelAdmin(BaseModelAdmin):
 
             return HttpResponseRedirect(post_url_continue % pk_value)
 
 
         if "_popup" in request.POST:
 
-            return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
 
+            return HttpResponse(
 
+                '<!DOCTYPE html><html><head><title></title></head><body>'
 
+                '<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script></body></html>' % \
 
                 # escape() calls force_unicode.
 
                 (escape(pk_value), escapejs(obj)))
 
         elif "_addanother" in request.POST:

+ 3 - 2
django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
Wyświetl plik 

@@ -74,11 +74,12 @@ function dismissAddAnotherPopup(win, newId, newRepr) {
 
     var name = windowname_to_id(win.name);
 
     var elem = document.getElementById(name);
 
     if (elem) {
 
-        if (elem.nodeName == 'SELECT') {
 
+        var elemName = elem.nodeName.toUpperCase();
 
+        if (elemName == 'SELECT') {
 
             var o = new Option(newRepr, newId);
 
             elem.options[elem.options.length] = o;
 
             o.selected = true;
 
-        } else if (elem.nodeName == 'INPUT') {
 
+        } else if (elemName == 'INPUT') {
 
             if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
 
                 elem.value += ',' + newId;
 
             } else {