Merge branch 'release/0.2.2'

rouxcode · Jun 15, 2017 · eeb817d · eeb817d
2 parents 3b48ca2 + f9aa582
commit eeb817d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,9 @@
 === (ongoing) ===
 - whatever
 
+=== 0.2.2 ===
+- fixing regression for django 1.8
+
 === 0.2.1 ===
 - first release on pypi
 - django 1.10 and 1.11 compatibility not yet

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,8 @@
 include README.md
+include CHANGELOG.txt
 recursive-include admin_sort *.py
 recursive-include admin_sort/locale *
 recursive-include admin_sort/static *
 recursive-include admin_sort/templates *
+recursive-include admin_sort/management *
 recursive-exclude * *.pyc
diff --git a/admin_sort/__init__.py b/admin_sort/__init__.py
@@ -1 +1 @@
-__version__ = '0.2.1'
+__version__ = '0.2.2'
diff --git a/admin_sort/static/admin_sort/js/sortable.inline.js b/admin_sort/static/admin_sort/js/sortable.inline.js
@@ -22,9 +22,9 @@ var SortableInline = (function ( $ ) {
 
     function init_stacked( $group ) {
         var $wrap = $('.inline-group', $group);
-        if ($wrap.find('fieldset.module').size()) {
+        if ($wrap.find('fieldset.module:not(.aligned)').size()) {
             // django > 1.9
-            $wrap = $wrap.find('fieldset.module')
+            $wrap = $wrap.find('fieldset.module:not(.aligned)')
         }
         var $inlines = $('.inline-related', $wrap);
         var $sortable_inlines = $inlines;

diff --git a/release.txt b/release.txt
@@ -1,4 +1,5 @@
 
+# dont change any files during procedure.
 
 git flow release start xxxx
 version bump in admin_sort/__init__.py
@@ -14,4 +15,3 @@ python setup.py register -r pypitest
 twine upload dist/* -r pypitest
 python setup.py register -r pypi
 twine upload dist/* -r pypi
-