Merge branch 'release/1.7.0'

Author: crucialfelix

.travis.yml

@@ -3,16 +3,15 @@ sudo: false
 env:
   - TOX_ENV=py27-flake8
   - TOX_ENV=py34-flake8
-  - TOX_ENV=py27-dj17
   - TOX_ENV=py27-dj18
   - TOX_ENV=py27-dj19
   - TOX_ENV=py27-dj110
   - TOX_ENV=py27-dj111
-  - TOX_ENV=py34-dj17
   - TOX_ENV=py34-dj18
   - TOX_ENV=py34-dj19
   - TOX_ENV=py34-dj110
   - TOX_ENV=py34-dj111
+  - TOX_ENV=py34-dj20
 install:
  - pip install -r requirements-test.txt
 script:

README.md

@@ -1,5 +1,4 @@
-
-Edit `ForeignKey`, `ManyToManyField` and `CharField` in Django Admin using jQuery UI AutoComplete.
+# Edit `ForeignKey`, `ManyToManyField` and `CharField` in Django Admin using jQuery UI AutoComplete.
 
 [![Build Status](https://travis-ci.org/crucialfelix/django-ajax-selects.svg?branch=master)](https://travis-ci.org/crucialfelix/django-ajax-selects) [![PyPI version](https://badge.fury.io/py/django-ajax-selects.svg)](https://badge.fury.io/py/django-ajax-selects)
 
@@ -9,16 +8,11 @@ Edit `ForeignKey`, `ManyToManyField` and `CharField` in Django Admin using jQuer
 
 ![selected](/docs/source/_static/kiss-all.png?raw=true)
 
-
-Documentation
-------------------
+## Documentation
 
 http://django-ajax-selects.readthedocs.org/en/latest/
 
-
-
-Quick Usage
------------
+## Quick Usage
 
 Define a lookup channel:
 
@@ -43,6 +37,8 @@ Add field to a form:
 
 ```python
 # yourapp/forms.py
+from ajax_select.fields import AutoCompleteSelectMultipleField
+
 class DocumentForm(ModelForm):
 
     class Meta:
@@ -51,46 +47,37 @@ class DocumentForm(ModelForm):
     tags = AutoCompleteSelectMultipleField('tags')
 ```
 
+## Fully customizable
 
+* Customize search query
+* Query other resources besides Django ORM
+* Format results with HTML
+* Customize styling
+* Customize security policy
+* Add additional custom UI alongside widget
+* Integrate with other UI elements elsewhere on the page using the javascript API
+* Works in Admin as well as in normal views
 
-Fully customizable
-------------------
-
-- Customize search query
-- Query other resources besides Django ORM
-- Format results with HTML
-- Customize styling
-- Customize security policy
-- Add additional custom UI alongside widget
-- Integrate with other UI elements elsewhere on the page using the javascript API
-- Works in Admin as well as in normal views
+## Assets included by default
 
+* //ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js
+* //code.jquery.com/ui/1.10.3/jquery-ui.js
+* //code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css
 
-Assets included by default
--------------------
+## Compatibility
 
-- //ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js
-- //code.jquery.com/ui/1.10.3/jquery-ui.js
-- //code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css
+* Django >=1.8, <=2.1
+* Python >=2.7, 3.3+
 
-Compatibility
--------------
-
-- Django >=1.6, <=1.10
-- Python >=2.7, 3.3-3.5
-
-
-Contributors
-------------
+## Contributors
 
 Many thanks to all contributors and pull requesters !
 
 https://github.com/crucialfelix/django-ajax-selects/graphs/contributors
 
-
-License
--------
+## License
 
 Dual licensed under the MIT and GPL licenses:
-- http://www.opensource.org/licenses/mit-license.php
-- http://www.gnu.org/licenses/gpl.html
+
+* http://www.opensource.org/licenses/mit-license.php
+* http://www.gnu.org/licenses/gpl.html

ajax_select/__init__.py

@@ -1,5 +1,5 @@
 """JQuery-Ajax Autocomplete fields for Django Forms."""
-__version__ = "1.6.1"
+__version__ = "1.7.0"
 __author__ = "crucialfelix"
 __contact__ = "[email protected]"
 __homepage__ = "https://github.com/crucialfelix/django-ajax-selects/"
@@ -8,14 +8,9 @@
 from ajax_select.helpers import make_ajax_form, make_ajax_field  # noqa
 from ajax_select.lookup_channel import LookupChannel  # noqa
 
-try:
-    # django 1.7+ will use the new AppConfig api
-    # It will load all your lookups.py modules
-    # and any specified in settings.AJAX_LOOKUP_CHANNELS
-    # It will do this after all apps are imported.
-    from django.apps import AppConfig  # noqa
-    default_app_config = 'ajax_select.apps.AjaxSelectConfig'
-except ImportError:
-    # Previous django versions should load now
-    # using settings.AJAX_LOOKUP_CHANNELS
-    registry.load_channels()
+# django 1.7+ will use the new AppConfig api
+# It will load all your lookups.py modules
+# and any specified in settings.AJAX_LOOKUP_CHANNELS
+# It will do this after all apps are imported.
+from django.apps import AppConfig  # noqa
+default_app_config = 'ajax_select.apps.AjaxSelectConfig'

ajax_select/apps.py

@@ -5,7 +5,7 @@ class AjaxSelectConfig(AppConfig):
 
     """
     Django 1.7+ enables initializing installed applications
-    and autodiscovering modules
+    and autodiscovering modules.
 
     On startup, search for and import any modules called `lookups.py` in all installed apps.
     Your LookupClass subclass may register itself.

ajax_select/fields.py

@@ -5,7 +5,6 @@
 from django import forms
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models import Model
 from django.forms.utils import flatatt
 from django.template.defaultfilters import force_escape
@@ -14,6 +13,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.six import text_type
 from django.utils.translation import ugettext as _
+from django.utils.module_loading import import_string
 
 from ajax_select.registry import registry
 
@@ -40,6 +40,10 @@ def _media(self):
     return forms.Media(css={'all': ('ajax_select/css/ajax_select.css',)}, js=js)
 
 
+json_encoder = import_string(getattr(settings, 'AJAX_SELECT_JSON_ENCODER',
+                                     'django.core.serializers.json.DjangoJSONEncoder'))
+
+
 ###############################################################################
 
 
@@ -227,7 +231,7 @@ def render(self, name, value, attrs=None):
             'current': value,
             'current_ids': current_ids,
             'current_reprs': mark_safe(
-                json.dumps(initial, cls=DjangoJSONEncoder)
+                json.dumps(initial, cls=json_encoder)
             ),
             'help_text': help_text,
             'extra_attrs': mark_safe(flatatt(final_attrs)),
@@ -439,7 +443,10 @@ def autoselect_fields_check_can_add(form, model, user):
     for name, form_field in form.declared_fields.items():
         if isinstance(form_field, (AutoCompleteSelectMultipleField, AutoCompleteSelectField)):
             db_field = model._meta.get_field(name)
-            form_field.check_can_add(user, db_field.rel.to)
+            if hasattr(db_field, "remote_field"):
+                form_field.check_can_add(user, db_field.remote_field.model)
+            else:
+                form_field.check_can_add(user, db_field.rel.to)
 
 
 def make_plugin_options(lookup, channel_name, widget_plugin_options, initial):
@@ -457,9 +464,9 @@ def make_plugin_options(lookup, channel_name, widget_plugin_options, initial):
         po['html'] = True
 
     return {
-        'plugin_options': mark_safe(json.dumps(po, cls=DjangoJSONEncoder)),
+        'plugin_options': mark_safe(json.dumps(po, cls=json_encoder)),
         'data_plugin_options': force_escape(
-            json.dumps(po, cls=DjangoJSONEncoder)
+            json.dumps(po, cls=json_encoder)
         )
     }
 

ajax_select/helpers.py

@@ -1,7 +1,7 @@
 from django.db.models.fields.related import ForeignKey, ManyToManyField
 from django.forms.models import ModelForm
-from django.utils.text import capfirst
 from django.utils.encoding import force_text
+from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -84,8 +84,8 @@ def make_ajax_field(related_model, fieldname_on_model, channel, show_help_text=F
         (AutoCompleteField, AutoCompleteSelectField, AutoCompleteSelectMultipleField): field
     """
     from ajax_select.fields import AutoCompleteField, \
-                                   AutoCompleteSelectMultipleField, \
-                                   AutoCompleteSelectField
+        AutoCompleteSelectMultipleField, \
+        AutoCompleteSelectField
 
     field = related_model._meta.get_field(fieldname_on_model)
     if 'label' not in kwargs:

ajax_select/lookup_channel.py

@@ -95,7 +95,10 @@ def get_objects(self, ids):
             list: list of Model objects
         """
         # Inherited models have a OneToOneField (rather than eg AutoField)
-        if self.model._meta.pk.rel is not None:
+        if getattr(self.model._meta.pk, "remote_field", False):
+            # Use the type of the field being referenced (2.0+)
+            pk_type = self.model._meta.pk.remote_field.field.to_python
+        elif getattr(self.model._meta.pk, "rel", False):
             # Use the type of the field being referenced
             pk_type = self.model._meta.pk.rel.field.to_python
         else:

ajax_select/models.py

@@ -1,5 +1,7 @@
-from django.core.exceptions import ImproperlyConfigured
+from django.apps import apps
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.utils.module_loading import autodiscover_modules
 
 
 class LookupChannelRegistry(object):
@@ -17,13 +19,7 @@ def load_channels(self):
         Called when loading the application. Cannot be called a second time,
         (eg. for testing) as Django will not re-import and re-register anything.
         """
-        self._registry = {}
-        try:
-            from django.utils.module_loading import autodiscover_modules
-        except ImportError:
-            pass
-        else:
-            autodiscover_modules('lookups')
+        autodiscover_modules('lookups')
 
         if hasattr(settings, 'AJAX_LOOKUP_CHANNELS'):
             self.register(settings.AJAX_LOOKUP_CHANNELS)
@@ -112,23 +108,7 @@ class MadeLookupChannel(LookupChannel):
 
 def get_model(app_label, model_name):
     """Loads the model given an 'app_label' 'ModelName'"""
-    try:
-        # django >= 1.7
-        from django.apps import apps
-    except ImportError:
-        # django < 1.7
-        from django.db import models
-        return models.get_model(app_label, model_name)
-    else:
-        return apps.get_model(app_label, model_name)
-
-
-def can_autodiscover():
-    try:
-        from django.apps import AppConfig  # noqa
-    except ImportError:
-        return False
-    return True
+    return apps.get_model(app_label, model_name)
 
 
 def register(channel):

ajax_select/registry.py

@@ -36,6 +36,7 @@ Include the urls in your project::
 
 Write a LookupChannel to specify the models, search queries, formatting etc. and register it with a channel name::
 
+      # app_name/lookup.py
       from ajax_select import register, LookupChannel
       from .models import Tag
 
@@ -56,6 +57,7 @@ For previous Djangos you can import them manually to your urls or views.
 Add ajax lookup fields in your admin.py::
 
     from django.contrib import admin
+    from ajax_select.admin import AjaxSelectAdmin
     from ajax_select import make_ajax_form
     from .models import Document