Bump to django 1.11

allegro · May 17, 2024 · a2d6337 · a2d6337
1 parent 7a11b0e
commit a2d6337
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,16 +1,16 @@
 -r openstack.txt
 -r hermes.txt
-Django==1.10.8
+Django==1.11.8
 dj.choices==0.11.0
 django-extensions==1.7.5
-django-filter==0.13.0
+django-filter==1.0.4
 django-import-export==1.2.0
 django-money==0.12
 py-moneyed==1.2
 django-mptt==0.8.7
 django-reversion==2.0
 django-rq==2.0
-django-sitetree==1.7.0
+django-sitetree==1.13.0
 django-taggit==0.22.2
 django-taggit-serializer==0.1.7
 django-threadlocals==0.8

diff --git a/src/ralph/admin/static/auto-complete-helpers.js b/src/ralph/admin/static/auto-complete-helpers.js
@@ -26,8 +26,6 @@ function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
 function dismissAddRelatedObjectPopup(win, newId, newRepr) {
     // newId and newRepr are expected to have previously been escaped by
     // django.utils.html.escape.
-    newId = html_unescape(newId);
-    newRepr = html_unescape(newRepr);
     var name = windowname_to_id(win.name);
     var elem = document.getElementById(name);
     var o;

diff --git a/src/ralph/admin/widgets.py b/src/ralph/admin/widgets.py
@@ -76,7 +76,7 @@ def value_from_datadict(self, data, files, name):
     def render(self, name, value, attrs=None, choices=()):
         attr_value = ','.join(map(str, value or []))
         final_attrs = self.build_attrs(
-            attrs, type='hidden', name=name, value=attr_value,
+            attrs, extra_attrs={name: attr_value}  # "type": 'hidden', "name": name, "value": attr_value}
         )
         return mark_safe(
             '<a class="expand action-expand">Expand all</a>'
@@ -97,7 +97,7 @@ def render_option(self, selected_choices, option_value, option_label):
         attrs = {'id': input_id, 'type': 'checkbox', 'value': option_value}
         if option_value in selected_choices:
             attrs['checked'] = 'checked'
-        attrs = self.build_attrs(**attrs)
+        attrs = self.build_attrs({**attrs})
         return '<input{}><label{}>{}</label>'.format(
             flatatt(attrs), flatatt({'for': input_id}), option_label
         )
@@ -310,4 +310,4 @@ def render(self, name, value, attrs=None):
         if not is_polymorphic and self.can_add:
             context['add_related_url'] = self.get_related_url(info, 'add')
         template = loader.get_template('admin/widgets/autocomplete.html')
-        return template.render(context)
+        return template.render(context.flatten())