Briq/django-admin-sortable-fixwin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
511 Commits 1 Branch 0 Tags
041558823e2d933caa5edd845e9f2e8926b7e669
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Taylor 041558823e Fixed return outside of function 2018-03-19 21:23:59 -04:00
Brandon Taylor 1e7ea7b75a Minor formatting fixes from merge. 2018-03-19 21:22:57 -04:00
Brandon Taylor 5d1529c161 Updated migrations to allow for a model with a non autofield as the primary key. 
Updated tests.
 2018-03-19 21:18:08 -04:00
Brandon Taylor d8df8bab55 Updated documentation around extending custom templates. 2018-03-19 20:54:23 -04:00
Brandon Taylor f515f93d22 Version bump to 2.1.3 
Updated readme with credits for translations.
 2018-02-25 11:49:38 -05:00
Brandon Taylor 604bfd035a Updated tox 2017-12-04 22:10:12 -05:00
Brandon Taylor d4f577fdf9 Update csrf value to use value if present in context, then fall back to cookie. 
Updated database samples.
Added migrations for sample project models.
Updated Category model to make order not editable.
 2017-12-04 22:05:37 -05:00
Brandon Taylor f4daaeb232 Restructured sample project for Django 2. 
Refactored database and changed "app" to "samples" so name didn't conflict with "AppConfig".
Replaced deprecated assignment_tag with simple_tag.
Updated unit tests.
 2017-12-04 21:29:55 -05:00
Brandon Taylor 10188ec8ac Merge branch 'touch-support' 2017-10-13 06:41:25 -04:00
Brandon Taylor d594dbaf62 Merge branch 'touch-support' of github.com:iambrandontaylor/django-admin-sortable into touch-support 2017-10-13 06:40:39 -04:00
Brandon Taylor 4e0c23a1e5 Version bump to 2.1.1. 
Updated readme files.
 2017-10-13 06:40:35 -04:00
Brandon Taylor bb70d5a3ad Added jQuery UI Touch Support 2017-10-11 07:15:42 -04:00
Brandon Taylor fc58ee51f0 Updated readme. 
Version bump to 2.0.18
 2016-07-09 18:26:00 -04:00
Brandon Taylor 0065e4780c Merged develop into master 2016-06-23 22:04:27 -04:00
Brandon Taylor ee857c7403 [bt] Release 2.0.17 
Merged Pull Requests #146 and #147
 2016-06-23 22:04:07 -04:00
Brandon Taylor 54482b3bb3 Merge branch 'master' into develop 2016-06-23 21:48:45 -04:00
Brandon Taylor 344927a393 Version 2.0.16 Changes 
Updated readme.
Version bump to 2.0.16
 2016-06-15 20:57:10 -04:00
Brandon Taylor 6ffbb9b358 Merge branch 'master' into develop 2016-06-15 20:40:48 -04:00
Brandon Taylor 307db84b66 Testing admin url cleanup 2016-06-15 20:25:56 -04:00
Brandon Taylor be29289d30 Bumping version due to PyPi error during upload. 2016-03-14 11:40:25 -04:00
Brandon Taylor 557d2d457d Fixed merge conflicts. 2016-03-14 11:36:41 -04:00
Brandon Taylor b888063f11 Fixed bad merge. 2016-03-14 11:12:01 -04:00
Brandon Taylor f004d97bf1 Refactored exception handling for order_field_name 2016-03-14 11:09:18 -04:00
Brandon Taylor ada42c84de Version bump to 2.0.13. 
Updated readme.
Slight refactor on JS to avoid extra function call.
Fixed missing semicolon.
 2016-03-10 16:41:23 -05:00
Brandon Taylor f44220c3de Fixed missing semicolon. 2016-03-10 16:36:26 -05:00
Brandon Taylor 837a25268d [bt] Updated selector for index value on sortable tabular inlines. 2016-03-10 16:21:08 -05:00
Brandon Taylor 70549b2517 Version bump to 2.0.12. 
Updated docs.
 2016-02-23 13:35:21 -05:00
Brandon Taylor 80719bace9 Merge branch 'master' into develop 2016-02-23 13:29:45 -05:00
Brandon Taylor c891f25bdf Merge branch 'develop' 
Adds custom CSRF_COOKIE_NAME support.
 2016-02-16 09:59:50 -05:00
Brandon Taylor c1181b0e52 Support CSRF_COOKIE_NAME 
Added support for custom CSRF_COOKIE_NAME by refactoring the jquery.django-csrf.js file into a separate .html file that can be used as an include, passing in the CSRF_COOKIE_NAME from settings.
 2016-02-16 08:48:32 -05:00
Brandon Taylor 5823af8047 Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable 2016-01-27 12:05:12 -05:00
Brandon Taylor 1e6a2b1f07 Merged develop and fixed merge conflict. 2016-01-27 12:05:04 -05:00
Brandon Taylor a7a6c12deb Refactored check for ordering information to keep backwards compatibility with Django 1.5.x 2016-01-27 11:50:42 -05:00
Brandon Taylor 15d8f20178 Fixed merged conflict in __init__.py 
Removed unused import in admin.py
 2016-01-27 11:26:03 -05:00
Brandon Taylor 66c73a6bdc Fixed access of custom order property in model meta, falling back to order for legacy implementations. 
Updated readme and version bump to 2.0.10
 2016-01-27 10:58:58 -05:00
Brandon Taylor 5baec21afe Added example images. 2015-12-27 12:35:56 -05:00
Brandon Taylor aa685a6c8f Minor updates to documentation. 2015-12-27 12:17:21 -05:00
Brandon Taylor 8c30ef88e8 Version bump to 2.0.9 2015-12-23 17:26:53 -05:00
Brandon Taylor b8a5238a09 Removed print debug statement. 
Updated readme and generated readme in Restructred Text format for PyPi.
 2015-12-23 17:22:53 -05:00
Brandon Taylor 7e9d305c90 Added template tag to get django version to allow flat admin specific classing for Django 1.9 or above. 2015-12-23 17:16:47 -05:00
Brandon Taylor 5dee27e077 Added sorting icons. 
Refactored determination of sortability of classes referenced as sortable foreign keys in admin in a more reliable way.
 2015-12-23 16:39:45 -05:00
Brandon Taylor b9e98ea959 Updated travis config to include Django 1.9 2015-12-21 14:15:28 -05:00
Brandon Taylor 698ca136d5 Refactored admin url patterns to be compatible with Django 1.8 or higher. 
Refactored sample_project imports to be compatible with Django 1.9
Updated unit tests for get_next/previous.
Version bump to 2.0.8.
Fixed typo in docs.
 2015-12-21 14:11:13 -05:00
Brandon Taylor f5c08f4116 Updated readme and version bump to 2.0.7 2015-11-18 09:22:56 -05:00
Brandon Taylor 3757ca98c0 Added extra JS to deterine which element to highlight in the case where all fieldsets of a stacked inline are set to collapse. 2015-11-18 09:20:45 -05:00
Brandon Taylor 2dab294b0c Updated readme. 
Version bump to 2.0.6.
Added JS to remove inline style added by jQueryUI when highlighting form rows.
 2015-11-18 07:52:18 -05:00
Brandon Taylor 455e5304aa Version bump to 2.0.5. 
Updated readme.
 2015-11-14 21:34:36 -05:00
Brandon Taylor fda8ec917f Version bump to 2.0.4. 
Updated readme.
 2015-11-12 08:02:49 -05:00
Brandon Taylor 5d1a6f5e98 Updated readme. 
Version bump to 2.0.3
 2015-10-20 09:05:52 -04:00
Brandon Taylor 736454287e Version bump to 2.0.2. 
Updated readme.
 2015-10-16 09:09:16 -04:00
Brandon Taylor 6c44bbb2a5 Added some test data. 2015-09-07 21:41:24 -04:00
Brandon Taylor 2543f02ce7 Fixed a typp in adminsortable/fields.py comments. 
Updated readme.
 2015-09-07 21:26:36 -04:00
Brandon Taylor bee71e6d40 Refactored order_field_name out of Sortable class, instead deriving from Meta.ordering, since you have to set Meta.ordering to the order field to get the proper Sorting anyway. 2015-09-02 09:38:10 -04:00
Brandon Taylor 74a6cadf8d Added legacy model definition back for seamless backwards compatibility. 
Updated readme.
Added sample legacy model implementation.
 2015-08-24 12:55:56 -04:00
Brandon Taylor 827f5f092e Removed migrations from sample_project. 2015-08-24 11:48:30 -04:00
Brandon Taylor c8b1211ddd Changed travis config to only develop branch. 2015-08-24 11:43:01 -04:00
Brandon Taylor 51033ea8f6 Updated travis config. 2015-08-24 09:19:58 -04:00
Brandon Taylor c50541aa74 Version bump to 1.8.5. 
Updated readme.
 2015-08-24 09:18:54 -04:00
Brandon Taylor 6c5a9058fe Minor PEP8, text and formatting tweaks. 2015-08-24 08:18:22 -04:00
Brandon Taylor 64b8b9dc39 Added model with custom order field and inline model with custom order field example. 2015-08-24 08:04:05 -04:00
Brandon Taylor 43fef78876 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. 2015-08-23 22:25:55 -04:00
Brandon Taylor b14d747f82 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. 2015-08-23 22:23:45 -04:00
Brandon Taylor 422343ff93 Updated readme. 2015-07-05 23:13:03 -04:00
Brandon Taylor 100177f11d Version bump to 1.8.4 2015-07-05 23:04:03 -04:00
Brandon Taylor 3fd7d4aff3 Re-organized setup. 2015-07-05 23:04:03 -04:00
Brandon Taylor 51ed60a127 Refactored unit test. 2015-07-05 23:03:59 -04:00
Brandon Taylor bfcd11f072 Added setup.cfg 2015-07-05 23:02:23 -04:00
Brandon Taylor da0da5e690 Fixes: Bug in get_previous() method #108 
Added ordering to _filter_objects internal method to correctly select previous object.
 2015-07-05 22:37:20 -04:00
Brandon Taylor d7e0ec45fa Refactored test for get_previous and get_next to iterate through all records for people. 2015-06-29 23:43:41 -04:00
Brandon Taylor dfc654121c Version to 1.7.8. 
Updated readme.
 2014-11-19 11:10:28 -05:00
Brandon Taylor ebda962dfe Update Travis config. 2014-11-19 11:07:05 -05:00
Brandon Taylor 7636e0e729 Update Travis config. 2014-11-19 11:05:44 -05:00
Brandon Taylor 7cd8f7cad3 Added Python 3 compatibility to sample project. 
Removed utils file and moved map_path function to settings.py.
Refactored tests for Python 2 and 3 compatibility.
Added inheritance check to get proper determination if a SortableForeignKey field is defined but the specified model does not inherit from Sortable.
 2014-11-19 10:58:55 -05:00
Brandon Taylor 81fc032c8b Merge pull request #96 from MagicSolutions/fix_js_for_inlines 
Make inlines to work corectly with non sortable inlines
 2014-11-18 10:17:12 -05:00
Brandon Taylor daadd190cb Added sortable non-online category example. 2014-11-08 08:49:07 -05:00
Brandon Taylor bcd328a101 Added child to str representation of self-referential model. 2014-11-03 11:19:59 -05:00
Brandon Taylor c855ad8be3 Updated version in readme. 2014-11-03 10:51:41 -05:00
Brandon Taylor a7179fece4 Version bump to 1.7.7. 
Updated readme with notes on self-referential SortableForeignKeys.
 2014-11-03 10:50:02 -05:00
Brandon Taylor a48cf00396 Added migrations, fixed queryset call and fixed meta inheritance for self-referential sample model. 2014-11-03 10:45:50 -05:00
Brandon Taylor 7c60d89c71 Data changes from testing. 2014-11-03 10:44:31 -05:00
Brandon Taylor e521d5c8ad Added extra check for object when sorting self-referential models. 2014-11-03 10:44:11 -05:00
Brandon Taylor 612c4f8031 Added method to check for self-referential sortable foreign keys. 2014-11-03 10:43:41 -05:00
Brandon Taylor d332563e27 Fixed call to queryset object for Django >= 1.7 2014-11-03 10:43:13 -05:00
Brandon Taylor 13945375f1 Version bump to 1.7.6. 
Updated readme.
 2014-10-24 20:43:12 -04:00
Brandon Taylor 42ae56af0b Changes to data from manual testing. 2014-10-24 20:38:13 -04:00
Brandon Taylor 0ac0b56121 Removed unused objects. 
Added Person create statements and removed call to fixture data to prevent migration problems across Django versions.
 2014-10-24 20:35:55 -04:00
Brandon Taylor be52851f38 Added new model and data. 2014-10-24 20:35:02 -04:00
Brandon Taylor ff4bc9b676 Deleted initial data fixture. 2014-10-24 20:34:42 -04:00
Brandon Taylor 5e318551ca Wired up SortableNonInlineCategory model to admin. 2014-10-24 20:34:06 -04:00
Brandon Taylor 6ec43fcd76 Added new model class to demonstrate a sortable model with a foreign key that is not sortable that is not defined as an inline. 2014-10-24 20:32:53 -04:00
Brandon Taylor 5eaf0987b9 Added a space after the legacy sortable_by parameter to separate it. 2014-10-24 20:31:02 -04:00
Brandon Taylor 116a933d92 Updated comments to be clearer. 
Minor formatting changes.
Cahnged check for sortable_by_class_is_sortable to use new check_model_is_sortable, rather than only relying on the number of objects.
 2014-10-24 20:30:14 -04:00
Brandon Taylor 3acd88e8c4 Added utility function to check if a model defined as a sortable foreign key inherits from Sortable and if there are more than one objects for that model. 2014-10-24 20:28:36 -04:00
Brandon Taylor 651064d3fb Added sortable model that will not be registered as an inline, but will have a non-sortable parent. 2014-10-24 09:15:07 -04:00
Brandon Taylor 4da0deb503 Updated readme. 
Version bump to 1.7.5
 2014-10-06 09:07:30 -04:00
Brandon Taylor ca2a414ded Added version specific overrides for get_queryset and get_query_set. 
Added new get_permissions_codename check for permissions in upcoming Django 1.8.
Refactored all version checks. All checks are done in tuple format instead of checking for a django major and minor version number.
Removed unused RequestFactory in tests.
 2014-10-06 08:56:41 -04:00
Brandon Taylor b705c924f0 Fixed comparison operator according to PEP8. 2014-10-04 11:55:12 -04:00
Brandon Taylor 9935f65ca0 Update README.md 2014-09-21 19:35:21 -04:00
Brandon Taylor 13c84e8d0b Updated readme docs for migrations. 2014-09-21 19:28:33 -04:00
Brandon Taylor 03cfdf2f3d Version bump to 1.7.4. 
Updated readme with additional NonSortableParentAdmin related docs.
 2014-09-21 19:20:55 -04:00