Skip to content

Commit

Permalink
Merge branch 'fix_for_dal_3.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
odormond committed Dec 28, 2020
2 parents 941ace8 + 2095bd0 commit 296f7b5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
6 changes: 2 additions & 4 deletions dal_admin_filters/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- encoding: utf-8 -*-
from dal import autocomplete, forward
from django import forms
from django.conf import settings
from django.contrib.admin.filters import SimpleListFilter
from django.contrib.admin.utils import get_fields_from_path
from django.forms.widgets import Media, MEDIA_TYPES, media_property
Expand All @@ -26,11 +27,8 @@ class Media:
}
js = (
'admin/js/jquery.init.js',
'autocomplete_light/jquery.init.js',
f'autocomplete_light/autocomplete_light{"" if settings.DEBUG else ".min"}.js',
'dal_admin_filters/js/forward-fix.js',
'dal_admin_filters/js/select2.full.min.js',
'autocomplete_light/autocomplete.init.js',
'autocomplete_light/forward.js',
'autocomplete_light/select2.js',
'dal_admin_filters/js/querystring.js',
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
$(document).ready(function () {
$('#changelist-filter').children().wrapAll('<form></form>'); // required for forward func
});
})(yl.jQuery);
})(django.jQuery);

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ <h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktr
window.location.search = search_replace('{{ spec.parameter_name }}', val);
});
});
})(yl.jQuery);
})(django.jQuery);
</script>
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=2.2.13
django-autocomplete-light>=3.3.2
django-autocomplete-light>=3.8.1

0 comments on commit 296f7b5

Please sign in to comment.