Merge branch 'release/1.4.3'

crucialfelix · crucialfelix · commit b93f45947c9a · 2016-03-13T14:08:49.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,6 @@ env:
   - TOX_ENV=py34-flake8
   - TOX_ENV=py27-dj15
   - TOX_ENV=py27-dj16
-  - TOX_ENV=py32-dj15
-  - TOX_ENV=py32-dj16
   - TOX_ENV=py33-dj15
   - TOX_ENV=py33-dj16
   - TOX_ENV=py27-dj17
@@ -15,6 +13,8 @@ env:
   - TOX_ENV=py34-dj17
   - TOX_ENV=py34-dj18
   - TOX_ENV=py34-dj19
+  # - TOX_ENV=py35-dj18
+  # - TOX_ENV=py35-dj19
 install:
  - pip install -r requirements-test.txt
 script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,20 @@
 # Change Log
 
-## [1.4.2](https://github.com/crucialfelix/django-ajax-selects/tree/1.4.2) (2016-01-18)
+## [1.4.3](https://github.com/crucialfelix/django-ajax-selects/tree/1.4.3) (2016-03-13)
+[Full Changelog](https://github.com/crucialfelix/django-ajax-selects/compare/1.4.2...1.4.3)
+
+**Closed issues:**
+
+- Additional stacked inlines clear un-saved autocomplete fields [\#156](https://github.com/crucialfelix/django-ajax-selects/issues/156)
+- support request: ManyToOneRel doesn't have expected attributes [\#154](https://github.com/crucialfelix/django-ajax-selects/issues/154)
 
+**Merged pull requests:**
+
+- Stop using deprecated \_meta api. [\#160](https://github.com/crucialfelix/django-ajax-selects/pull/160) ([kramarz](https://github.com/kramarz))
+- Fixed file name in documentation for custom templates. [\#158](https://github.com/crucialfelix/django-ajax-selects/pull/158) ([sebslomski](https://github.com/sebslomski))
+- Fixes re-initialization upon adding inlines [\#157](https://github.com/crucialfelix/django-ajax-selects/pull/157) ([funkyfuture](https://github.com/funkyfuture))
+
+## [1.4.2](https://github.com/crucialfelix/django-ajax-selects/tree/1.4.2) (2016-01-18)
 [Full Changelog](https://github.com/crucialfelix/django-ajax-selects/compare/1.4.1...1.4.2)
 
 **Fixed bugs:**
@@ -19,7 +32,7 @@
 
 **Closed issues:**
 
-- Templates not included in pypi 1.4.0 package [\#141](https://github.com/crucialfelix/django-ajax-selects/issues/141)
+- Templates not included in pypi1.4.0 package [\#141](https://github.com/crucialfelix/django-ajax-selects/issues/141)
 - Documentation seems to be broken on RTD [\#140](https://github.com/crucialfelix/django-ajax-selects/issues/140)
 
 ## [1.4.0](https://github.com/crucialfelix/django-ajax-selects/tree/1.4.0) (2015-11-07)
@@ -201,4 +214,4 @@
 ## [1.1.0](https://github.com/crucialfelix/django-ajax-selects/tree/1.1.0) (2010-03-06)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/README.md b/README.md
@@ -77,7 +77,8 @@ Compatibility
 -------------
 
 - Django >=1.5, <=1.9
-- Python >=2.7, <=3.4
+- Python >=2.7, 3.3-3.5
+
 
 Contributors
 ------------
diff --git a/ajax_select/__init__.py b/ajax_select/__init__.py
@@ -1,5 +1,5 @@
 """JQuery-Ajax Autocomplete fields for Django Forms."""
-__version__ = "1.4.2"
+__version__ = "1.4.3"
 __author__ = "crucialfelix"
 __contact__ = "crucialfelix@gmail.com"
 __homepage__ = "https://github.com/crucialfelix/django-ajax-selects/"
diff --git a/ajax_select/fields.py b/ajax_select/fields.py
@@ -407,7 +407,7 @@ 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_by_name(name)[0]
+            db_field = model._meta.get_field(name)
             form_field.check_can_add(user, db_field.rel.to)
 
 
diff --git a/ajax_select/static/ajax_select/js/ajax_select.js b/ajax_select/static/ajax_select/js/ajax_select.js
@@ -228,8 +228,8 @@
     // if dynamically injecting forms onto a page
     // you can trigger them to be ajax-selects-ified:
     $(window).trigger('init-autocomplete');
-    $('.inline-group ul.tools a.add, .inline-group div.add-row a, .inline-group .tabular tr.add-row td a')
-      .on('click', function() {
+    $(document)
+      .on('click', '.inline-group ul.tools a.add, .inline-group div.add-row a, .inline-group .tabular tr.add-row td a', function() {
         $(window).trigger('init-autocomplete');
       });
   });
diff --git a/docs/source/Release-notes.rst b/docs/source/Release-notes.rst
@@ -1,6 +1,7 @@
 Release Notes
 =============
 
+See also CHANGELOG.md for github issues and bugfixes
 
 1.4.0
 =====
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -2,4 +2,5 @@ coverage
 coveralls
 flake8>=2.1.0
 tox>=1.7.0
+sphinx>=1.3.5
 sphinx_rtd_theme
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-django>=1.5.1, <1.9
+django>=1.5.1, <=1.9
 wheel==0.24.0
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
 ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E133
-exclude = ./example/AJAXSELECTS/lib/*
+exclude = ./example/AJAXSELECTS/lib/*,./example/AJAXSELECTS/bin/*,./docs/*
 max-line-length = 120
 max-complexity = 10
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='django-ajax-selects',
-    version='1.4.2',
+    version='1.4.3',
     description='Edit ForeignKey, ManyToManyField and CharField in Django Admin using jQuery UI AutoComplete.',
     author='Chris Sattinger',
     author_email='crucialfelix@gmail.com',
@@ -55,6 +55,6 @@
 - Works in Admin as well as in normal views
 
 - Django >=1.5, <=1.9
-- Python >=2.7, <=3.4
+- Python >=2.7, <=3.5
 """
 )
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
   {py27,py34}-flake8,
-  {py27,py32,py33}-dj{15,16},
-  {py27,py34,py35}-dj{17,18,19}
+  {py27,py33}-dj{15,16},
+  {py27,py34}-dj{17,18,19}
 skip_missing_interpreters = true
 
 
@@ -17,19 +17,14 @@ deps =
   dj16: Django>=1.6,<1.7
   dj17: Django>=1.7,<1.8
   dj18: Django>=1.8,<1.9
-  dj19: Django==1.9b1
+  dj19: Django>=1.9,<1.10
   ; djmaster: https://github.com/django/django/zipball/master
 
 [testenv:py27-flake8]
 deps =
   flake8
 commands = flake8 ajax_select tests example
 
-[testenv:py32-flake8]
-deps =
-  flake8
-commands = flake8 ajax_select tests example
-
 [testenv:py33-flake8]
 deps =
   flake8

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-django>=1.5.1, <1.9`
	`1`	`+django>=1.5.1, <=1.9`
`2`	`2`	`wheel==0.24.0`