From 48ce0b5703cb087b7559c420e1e6510926494a94 Mon Sep 17 00:00:00 2001 From: "AppleGrew (applegrew)" Date: Sun, 5 Aug 2012 15:18:27 +0530 Subject: [PATCH] Some fix for setup. --- django_select2/__init__.py | 14 +++++++++----- django_select2/fields.py | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/django_select2/__init__.py b/django_select2/__init__.py index c016a4e..5c7ebe3 100644 --- a/django_select2/__init__.py +++ b/django_select2/__init__.py @@ -1,5 +1,9 @@ -from .widgets import Select2Widget, Select2MultipleWidget, HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget -from .fields import Select2ChoiceField, Select2MultipleChoiceField, \ - HeavySelect2ChoiceField, HeavySelect2MultipleChoiceField, \ - ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field -from .views import Select2View, NO_ERR_RESP +__version__ = "1.0" + +from django.conf import settings +if settings.configured: + from .widgets import Select2Widget, Select2MultipleWidget, HeavySelect2Widget, HeavySelect2MultipleWidget, AutoHeavySelect2Widget + from .fields import Select2ChoiceField, Select2MultipleChoiceField, \ + HeavySelect2ChoiceField, HeavySelect2MultipleChoiceField, \ + ModelSelect2Field, AutoSelect2Field, AutoModelSelect2Field + from .views import Select2View, NO_ERR_RESP diff --git a/django_select2/fields.py b/django_select2/fields.py index 49668db..ececda6 100644 --- a/django_select2/fields.py +++ b/django_select2/fields.py @@ -17,9 +17,9 @@ class AutoViewFieldMixin(object): import copy from django import forms +from django.db.models import Q from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import smart_unicode -from django.db.models import Q from django.core.validators import EMPTY_VALUES from .widgets import Select2Widget, Select2MultipleWidget,\ @@ -43,7 +43,7 @@ class ModelResultJsonMixin(object): def label_from_instance(self, obj): return smart_unicode(obj) - def prepare_qs_params(self, request, search_term, search_fields): + def prepare_qs_params(self, request, search_term, search_fields): q = None for field in search_fields: kwargs = {}