Commit graph

51 commits

Author SHA1 Message Date
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
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
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
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
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
b14d747f82 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. 2015-08-23 22:23:45 -04:00
Brandon Taylor
51ed60a127 Refactored unit test. 2015-07-05 23:03:59 -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
tomd
7f0519afbe Fix sort changelist for objects with sortable fk
Loading the test app '/admin/app/project/sort/' changelist failed with
the following error:

UnboundLocalError: local variable 'objects' referenced before assignment

(utils.py, check_model_is_sortable)

See test sample_app test_adminsortable_change_list_view_loads_with_sortable_fk
2015-01-12 15:40:33 +00:00
Brandon Taylor
34e5d62245 Fixed merge conflict. 2014-12-22 10:30:56 -05:00
Brandon Taylor
a3c1f4457a Fixed merge conflicts. 2014-12-22 10:27:46 -05:00
Brandon Taylor
01403f1b8c Merged pull request 97 2014-12-22 10:25:35 -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
Venelin Stoykov
cbce6debb4 Update sample_project for easy testing sortable and nonsortable inlines 2014-11-18 17:04:58 +02:00
Brandon Taylor
daadd190cb Added sortable non-online category example. 2014-11-08 08:49:07 -05: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
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
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
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
234a0118db Added NonSortableCategory and SortableCategoryWidget model classes.
Wired up NonSortableCategory and inline sortable SortableCategoryWidget to sample project admin.
2014-09-21 15:14:03 -04:00
Brandon Taylor
da20ef0b53 Removed south entirely from project. 2014-09-12 09:35:50 -04:00
Brandon Taylor
82e683756e Fixed string formatting for Python 2.6 in tests.
Updated Travis Python 2.7 version to 2.7.6.
More excludes.
2014-09-12 09:20:36 -04:00
Brandon Taylor
dd30e39674 Added sample Project using Python 3.4 and Django 1.7. 2014-09-06 20:36:51 -04:00
Brandon Taylor
8df54f43e1 Added basic test of get_next/previous. 2014-09-06 14:53:11 -04:00
Christopher Grebs
e4a79e1d62 Fix python 2.6 compatibility 2014-05-26 14:52:46 +02:00
Brandon Taylor
80bdaafdc3 Refactored sorting_filters into a tuple and moved logic for retrieving sorting filters into the sort_view versus changelist_view.
Updated readme.
Updated sample project to leverage new sorting_filters on Person model and admin.
Removed custom change list template for Person admin.
2014-03-05 09:10:47 -05:00
Brandon Taylor
1b4730fef9 Added Person model with sorting_filters set to only order people who are board members.
Added custom template override to specify which people are sortable in change list.
Added initial data fixture for people.
2014-02-05 11:08:02 -05:00
Brandon Taylor
e51f7535ca Added Person model with ordering_subset and initial data. 2014-02-05 09:36:03 -05:00
Brandon Taylor
8f64f6ea76 Bumped version to 1.5.5.
Fixed namespacing of so sorting urls.
Changed namespacing of sortable() calls.
Removed unit test to check for javascript include template, which has been eliminated.
2013-09-23 08:41:10 -04:00
Brandon Taylor
847b471872 Added properties to allow sortable change list and change form view to extend a custom template or extend the default admin change form and change list templates.
Fixed a problem with the detection of sortability of inline models at the template level that was preventing the drag-and-drop messaging in the template to be displayed.
Updated unit tests.
2013-05-03 08:35:17 -04:00
Brandon Taylor
014f6d1660 Added support for queryset() overrides on admin classes and inline admin classes.
Updated version to 1.4.5.
Updated README with explanation of requirements for overriding queryset() on inline models.
Added extra models to sample project to demonstrate sortable models with custom querysets.
Improved JavaScript of sortables to be more efficient with better comparison checking.
Fixed highlighting of stacked inlines on sort finish.
2013-04-27 22:58:02 -04:00
Brandon Taylor
ece9876a47 Minor PEP8 improvements.
Updated version to 1.4.1.
Updated README.
2013-03-15 07:31:14 -04:00
intelliadmin
279477da7b added generic inlines support 2013-03-15 10:10:01 +01:00
Brandon Taylor
a54e81434f Minor modifications for Django 1.5.x and 1.4.x backward-compatibility.
Added new sample project.
Improved documentation.
Refactored CSS selector for inlines that are sortable.
2013-03-10 20:53:05 -04:00
Brandon Taylor
810f8a0dd4 Fixed the inline stacked sortable template by passing in the original object rather than passing in the model type id of the original object.
Various PEP8 enhancements.
2012-11-02 09:04:32 -04:00
Alexander A. Sosnovskiy
754bd78210 Fixed tests for app application. 2012-09-24 16:49:33 +03:00
Brandon Taylor
866adffd7b Updated CSS classing of sortable inline and stacked items.
Concatenated classing of sortable inlines into one stylesheet.
Updated version to 1.3.3
Updated README
2012-07-09 11:05:59 -04:00
Brandon Taylor
484f00d263 Updated version to 1.3.2.
Updated status to stable/production.
Added AttributeError exception handling for models that specify a SortableForeignKey that does not inherit from Sortable.
Added template support for nested objects that are sortable by a foreign key, where the foreign key is not sortable.
2012-06-07 09:38:36 -04:00
Brandon Taylor
e6e0d728d7 Removed initial_data which was breaking unit tests. 2012-04-23 23:11:11 -05:00
Brandon Taylor
37f91cce97 Added SortableForeignKey field to replace sortable_by model property.
Refactored how the sortable_by properties get populated by looping over the model fields until we get to the SortableForeignKey, then grabbing properties from the field and its related data.
2012-02-24 22:35:30 -06:00
Brandon Taylor
63a80f5953 Incremented version to 1.2.
Refactored ORM calls to properly order objects by the sortable_by property to ensure objects are grouped correctly in the sortable change list template after being passed through dynamic_regroup.
Fixed missing import for jquery.effects.core, again.
Refactored sortable_by classmethod into a property.
2011-11-22 22:19:39 -06:00
unknown
1b9c5c0a64 Refactored sortable_by into a property instead of a classmethod.
Added backwards compatibility for pre 1.1.1 versions that still have sortable_by defined as a classmethod.
Need to address dynamic regroup template tag to see why categories are not being grouped properly in sample app.
2011-11-22 20:42:36 -06:00
Brandon Taylor
7a242dd41c Refactored classmethods to use aggregation Max instead order_by. 2011-11-16 20:24:33 -06:00
Brandon Taylor
8365043e0e Modified classmethod queries that determine if a Model is sortable to only retieve one record and not use count.
Fixed jQueryUI highlight method call in success handler of ajax function when dragging stops.
Fixed missing script resource for jquery.effects.core.js
2011-11-16 00:48:14 -06:00
Brandon Taylor
31f28d5b50 Removed all .pyc files 2011-09-14 09:17:31 -05:00
Brandon Taylor
971de8423c Added support for stacked inline models.
Added highlighting to sorted inline.
Added migrations to add Note class to database.
Added SortableInlineBase for checking type of model specified in inline model subclasses Sortable.
2011-09-03 22:02:48 -05:00