Merge branch 'master' into stable/3.0.x

sehmaschine · Mar 13, 2024 · 15393d4 · 15393d4
2 parents 24fe279 + 976506b
commit 15393d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/grappelli/settings.py b/grappelli/settings.py
@@ -24,7 +24,7 @@
 # SWITCH_USER_ORIGINAL: Defines if a user is a valid target.
 # Gets a user object and returns True/False.
 SWITCH_USER_TARGET = getattr(settings, "GRAPPELLI_SWITCH_USER_TARGET", lambda original_user, user: user.is_staff and not user.is_superuser)
-SWITCH_USER_REGEX = getattr(settings, "GRAPPELLI_SWITCH_USER_REGEX", "\d+")
+SWITCH_USER_REGEX = getattr(settings, "GRAPPELLI_SWITCH_USER_REGEX", r"\d+")
 
 # CLEAN INPUT TYPES
 # Replaces input types: search, email, url, tel, number, range, date

diff --git a/grappelli/static/admin/js/admin/RelatedObjectLookups.js b/grappelli/static/admin/js/admin/RelatedObjectLookups.js
@@ -52,6 +52,7 @@
         }
         // GRAPPELLI CUSTOM: element focus
         elem.focus();
+        $(elem).trigger('change');
         win.close();
     }
 

diff --git a/grappelli/templates/admin/delete_confirmation.html b/grappelli/templates/admin/delete_confirmation.html
@@ -52,8 +52,8 @@ <h2>{% blocktrans with escaped_object=object %}Are you sure you want to delete t
                 <div class="grp-module grp-submit-row grp-fixed-footer">
                     <ul>
                         {% url opts|admin_urlname:'change' object.pk|admin_urlquote as object_url %}
-                        <li class="grp-float-left"><a href="{% add_preserved_filters object_url %}" class="grp-button grp-cancel-link">{% trans "Cancel" %}</a></li>
-                        <li><input type="submit" value="{% trans "Yes, I'm sure" %}" class="grp-button grp-default" /></li>
+                        <li class="grp-float-left"><a href="{% add_preserved_filters object_url %}" class="grp-button grp-cancel-link">{% trans "No, take me back" %}</a></li>
+                        <li><input type="submit" value="{% trans "Yes, I’m sure" %}" class="grp-button grp-default" /></li>
                     </ul>
                     <input type="hidden" name="post" value="yes" />
                     {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}