Ticket #10327: 10327-r9969.diff

django/contrib/admin/media/js/admin/RelatedObjectLookups.js

@@ -36 +36 @@
     } else {
         href = triggeringLink.href + '?pop=1';
     }
+    if (window.location.host != document.domain) {
+        href += '&jsdom=' + document.domain
+    }
     var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
     win.focus();
     return false;

django/contrib/admin/options.py

@@ -678 +678 @@
         context = {
             'title': cl.title,
             'is_popup': cl.is_popup,
+            'js_domain': cl.js_domain,
             'cl': cl,
             'has_add_permission': self.has_add_permission(request),
             'root_path': self.admin_site.root_path,

django/contrib/admin/views/main.py

@@ -27 +27 @@
 TO_FIELD_VAR = 't'
 IS_POPUP_VAR = 'pop'
 ERROR_FLAG = 'e'
+JS_DOMAIN_VAR = 'jsdom'
 
 # Text to display within change-list table cells if the value is blank.
 EMPTY_CHANGELIST_VALUE = '(None)'
@@ -53 +54 @@
             self.page_num = 0
         self.show_all = ALL_VAR in request.GET
         self.is_popup = IS_POPUP_VAR in request.GET
+        self.js_domain = request.GET.get(JS_DOMAIN_VAR, '')
         self.to_field = request.GET.get(TO_FIELD_VAR)
         self.params = dict(request.GET.items())
         if PAGE_VAR in self.params:
@@ -170 +172 @@
     def get_query_set(self):
         qs = self.root_query_set
         lookup_params = self.params.copy() # a dictionary of the query string
-        for i in (ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR):
+        for i in (ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR, JS_DOMAIN_VAR):
             if i in lookup_params:
                 del lookup_params[i]
         for key, value in lookup_params.items():

django/contrib/admin/templates/admin/base.html

@@ -8 +8 @@
 <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% load adminmedia %}{% admin_media_prefix %}css/ie.css{% endblock %}" /><![endif]-->
 {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}
 <![endif]>
+{% if js_domain %}<script type="text/javascript">document.domain = "{{ js_domain }}"</script>{% endif %}
 {% block extrahead %}{% endblock %}
 {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
 </head>