Commit graph

68 commits

Author SHA1 Message Date
Jaap Roes
aa9c4a6063 User.is_authenticated is a property from Django 1.10 and onward 2017-03-16 16:21:59 +01:00
Jaap Roes
a5eca5ea4d assertEquals is deprecated in Python 3 2017-03-16 16:21:59 +01:00
Jaap Roes
defaf45e9a Make it clear why the httplib import is guarded by a try except and has a fallback 2017-03-16 16:21:59 +01:00
Jaap Roes
b8bfbe0c9a Explicitly set on_delete=models.CASCADE on ForeignKey as it will be required in Django 2.0 2017-03-16 16:21:59 +01:00
Jaap Roes
28fe5d1460 Run non auto field model test unconditional 2017-03-16 16:21:59 +01:00
Jaap Roes
9997644929 Run uuid field tests unconditional 2017-03-16 16:21:59 +01:00
Jaap Roes
ac507e4484 Remove get_queryset fallback 2017-03-16 16:21:58 +01:00
Jaap Roes
74e0c92455 Remove contenttypes.generic import fallbacks 2017-03-16 16:21:58 +01:00
Brandon Taylor
863ff69719 Fix Sorting by ForeignKey
Removed do_inline_sorting_url and get_object_or_404 check in admin. The model_type_id should *always* be passed in.
Removed test that asserted that Categories weren't sortable as part of the Project admin. Categories *should* be sortable as part of Project admin as they are a Sortable ForeignKey.
Fixed object_rep template to pass in model_type_id again.
Updated README.
Version bump to 2.0.21
2016-10-30 11:33:20 -04:00
Brandon Taylor
6e6b92d759 Skipped UUID-pk model if Django less than 1.8 2016-10-12 22:14:22 -04:00
Brandon Taylor
bf75b85190 Skipped UUI import for Django less than 1.8 2016-10-12 22:07:54 -04:00
Brandon Taylor
76378483ff Skipped UUID pk test for less than Django 1.8 2016-10-12 22:03:22 -04:00
Brandon Taylor
fcf2829633 Skipped UUID pk test if less than Django 1.7 2016-10-12 21:50:42 -04:00
Ruben Dura Tari
e4355d84bc Adds test 2016-10-11 19:47:17 +01:00
Brandon Taylor
e9b03a3a4f Merge pull request #143 from MagicSolutions/fix/admin-urs
Use separate URLs per model in administration to do the sorting
2016-08-03 10:06:29 -04:00
Steven H Johnson
f850e639c9 Add help text to test tabular icons between django 1.8 and 1.9 2016-07-09 16:31:36 -04:00
Venelin Stoykov
a479198799 Use separate URLs per model in administration to do the sorting
- Correctly check if current user has permissions to made the change

Fixes #142
2016-06-16 14:41:03 +03: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
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