close django admin warning modal on continue (#1114)

bihealth · Feb 1, 2023 · dd1be5d · dd1be5d
1 parent d21e3fb
commit dd1be5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -37,6 +37,7 @@ Changed
     - Rename ``AppSettingAPI`` methods (#539, #1040)
     - Deprecate old ``AppSettingAPI`` method names (#539, #1039)
     - Hide apps in ``PROJECTROLES_HIDE_APP_LINKS`` from superusers (#1042)
+    - Close Django admin warning modal on continue (#1114)
 - **Siteinfo**
     - Use project type display names in stats view (#1107)
 

diff --git a/projectroles/templates/projectroles/base.html b/projectroles/templates/projectroles/base.html
@@ -120,6 +120,9 @@
                 $('.modal-title').text('Warning!');
                 var htmlData = '{{ admin_warning|safe }}';
                 $('.modal-body').html(htmlData);
+                $('#sodar-pr-btn-admin-continue').click(function () {
+                    $('#sodar-modal').modal('hide');
+                });
            });
         });
     </script>

diff --git a/projectroles/templatetags/projectroles_tags.py b/projectroles/templatetags/projectroles_tags.py
@@ -326,7 +326,7 @@ def get_admin_warning():
     )
     ret += (
         '<p><a class="btn btn-danger pull-right" role="button" '
-        'target="_blank" href="{}">'
+        'target="_blank" href="{}" id="sodar-pr-btn-admin-continue">'
         '<i class="iconify" data-icon="mdi:cogs"></i> Continue to Django Admin'
         '</a></p>'.format(reverse('admin:index'))
     )