Skip to content

Commit

Permalink
Merge pull request #61 from BureauxLocaux/fix-heroku-deployment
Browse files Browse the repository at this point in the history
Fix AdvancedFilterForm Media declaration
  • Loading branch information
asfaltboy committed Dec 20, 2017
2 parents d7acb36 + 78fc51b commit 699373b
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions advanced_filters/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from django.db.models import Q, FieldDoesNotExist
from django.db.models.fields import DateField
from django.forms.formsets import formset_factory, BaseFormSet
from django.templatetags.static import static
from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _
from django.utils.six.moves import range, reduce
Expand Down Expand Up @@ -253,16 +252,19 @@ class Meta:
fields = ('title',)

class Media:
required_js = [static('admin/js/%sjquery.min.js' %
('vendor/jquery/' if USE_VENDOR_DIR else '')),
static('advanced-filters/jquery_adder.js'),
static('orig_inlines%s.js' %
('' if settings.DEBUG else '.min')),
static('magnific-popup/jquery.magnific-popup.js'),
static('advanced-filters/advanced-filters.js'), ]
required_js = [
'admin/js/%sjquery.min.js' % ('vendor/jquery/' if USE_VENDOR_DIR else ''),
'advanced-filters/jquery_adder.js',
'orig_inlines%s.js' % ('' if settings.DEBUG else '.min'),
'magnific-popup/jquery.magnific-popup.js',
'advanced-filters/advanced-filters.js',
]
js = required_js + [SELECT2_JS]
css = {'screen': [static(SELECT2_CSS), static('advanced-filters/advanced-filters.css'),
static('magnific-popup/magnific-popup.css')]}
css = {'screen': [
SELECT2_CSS,
'advanced-filters/advanced-filters.css',
'magnific-popup/magnific-popup.css'
]}

def get_fields_from_model(self, model, fields):
"""
Expand Down

0 comments on commit 699373b

Please sign in to comment.