Merge branch 'dev'

jet/static/admin/js/admin/RelatedObjectLookups.js

@@ -66,6 +66,14 @@ function showRelatedObjectPopup(triggeringLink) {
     var href = triggeringLink.href;
 
     // Django JET
+    if (href.indexOf('_popup=1') == -1) {
+        if (href.indexOf('?') == -1) {
+            href += '?_popup=1';
+        } else {
+            href += '&_popup=1';
+        }
+    }
+
     showRelatedPopup(name, href);
 
     return false;
@@ -147,8 +155,9 @@ opener = parent.window;
 
 function showRelatedPopup(name, href) {
     django.jQuery(function($) {
-        var $container = $('.related-popup-container');
-        var $loading = $container.find('.loading-indicator');
+        var $container = $('.related-popup-container', parent.document);
+        var $loading = $container.find('.loading-indicator', parent.document);
+        var $body = $('body').addClass('non-scrollable', parent.document);
         var $popup = $('<iframe>').attr('name', name).attr('src', href).addClass('related-popup').on('load', function() {
             $popup.add($('.related-popup-back')).fadeIn(200, 'swing', function() {
                 $loading.hide();
@@ -157,9 +166,9 @@ function showRelatedPopup(name, href) {
 
         $loading.show();
         $container.fadeIn(200, 'swing', function() {
-            $('.related-popup-container').append($popup);
+            $container.append($popup);
         });
-        $('body').addClass('non-scrollable');
+        $body.addClass('non-scrollable', parent.document);
     });
 }
 

jet/templates/admin/change_form.html

@@ -76,7 +76,7 @@
                     </ul>
                 {% endif %}
 
-                {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}
+                {% if is_popup %}<input type="hidden" name="{{ is_popup_var|default:"_popup" }}" value="1" />{% endif %}
                 {% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %}
                 {% if errors %}
                     {{ adminform.form.non_field_errors }}
@@ -106,12 +106,13 @@
                 {% block admin_change_form_document_ready %}
                     <script type="text/javascript">
                         (function($) {
+                            {# JET: Add handlers for Django <= 1.6 #}
                             $(document).ready(function() {
-                                $('.add-another').click(function(e) {
+                                $('.add-another').removeAttr('onclick').click(function(e) {
                                     e.preventDefault();
                                     showAddAnotherPopup(this);
                                 });
-                                $('.related-lookup').click(function(e) {
+                                $('.related-lookup').removeAttr('onclick').click(function(e) {
                                     e.preventDefault();
                                     showRelatedObjectLookupPopup(this);
                                 });