Hopiu/django-admin-sortable
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin-sortable.git synced 2026-03-23 01:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
610 commits 3 branches 56 tags 2 MiB
Commit graph

123 commits

Author SHA1 Message Date
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
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
giacomo
84e42720e7 Fix typo in warning 
Tabluar -> Tabular
 2016-01-12 16:13:15 +01: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
Daniel Otero
11e445d99e Variable jQuery path for Django version 1.9 and above 2015-12-08 22:04:05 +01:00
zakdoek
995baee2d3 Fix bug when used with descending order 2015-10-20 14:11:49 +02: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
6c5a9058fe Minor PEP8, text and formatting tweaks. 2015-08-24 08:18:22 -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
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
ad09081ab4 Added exception handling for get_queryset attribute. 2015-04-08 22:06:14 -04:00
ILYA
cbc27663a3 Refactored import from generic module to get rid of DeprecationWarning 2015-02-25 19:38:29 +03:00
mark@ignacio.io
d841ebfbfe removed print statements 2014-12-27 12:12:47 -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
matt-leach
c7f2d63ec9 calling the correct queryset/get_queryset for VERSION 2014-12-22 14:44:02 +00:00
matt-leach
cf1a2103dd Updating VERSION comparison to be compatible with all 1.5.x 2014-12-22 14:36:15 +00:00
Brandon Taylor
d332563e27 Fixed call to queryset object for Django >= 1.7 2014-11-03 10:43:13 -05: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
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
f33f5e90ed Refactored do_sorting_view to get start_index default value from len(indexes) rather than duplicate the line and set to 0. 
Added NonSortableParentAdmin class to enable sorting URLs and JavaScript on models that do not inherit from Sortable.
Removed unused 'ordering' property on SortableAdmin.
Changed assignment of sorting_filters to use getattr, enabling NonSortableParentAdmin to inherit from SortableAdminBase.
Moved template properties to SortableAdminBase.
 2014-09-21 15:12:30 -04:00
Brandon Taylor
e08077a0b2 PEP8 cleanup. 2014-09-06 14:51:26 -04:00
Brandon Taylor
27686d6f79 Removed unused variable. 2014-09-06 12:38:00 -04:00
Brandon Taylor
fee0ba81b0 Moved logic to set sortable_foreign_key property to Sortable instead of SortableAdmin. 
Added instance methods to get next or previous instance, optionally filtered by a sortable foreign key field.
 2014-09-05 23:02:29 -04:00
Scott Clark
41fa948bb2 ModelAdmin.change_view takes a form_url kwarg 
This allows change_view super calls to AdminSortable and
ModelAdmin to play nice with each other.
 2014-09-04 14:07:55 -06:00
Brandon Taylor
e19edc7d9e Merge pull request #81 from EnTeQuAk/feature/python-2.6 
Fix python 2.6 compatibility
 2014-05-29 10:22:15 -04:00
Evgeniy Kirov
357268e9b0 Fix "except" 2014-05-28 16:11:04 +04:00
Christopher Grebs
e4a79e1d62 Fix python 2.6 compatibility 2014-05-26 14:52:46 +02:00
Brandon Taylor
13549da827 Removed un-needed format specificity. 2014-03-05 09:24:32 -05: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
95e21eea5e Merge branch 'order-subset' 2014-02-05 11:13:58 -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
A.Sichkar
cadf41dd1d Python 2.6.x compatibility fix (unindexed str.format in admin.py 2014-01-13 15:35:23 +02:00
João Miguel Neves
644583c08f enable js correctly for generic inlines 2013-12-03 11:32:31 +00:00
Brandon Taylor
469e7d5d4d Added new stacked and tabular change form templates for inlines from Django 1.6. 
Added backwards compatibility changes for the setting of the edit inline template to use.
 2013-11-25 22:03:20 -05:00
Brandon Taylor
41be929a7d Fixed path to jQueryUI in change form. 
Version bump to 1.6.1
 2013-11-25 21:32:34 -05:00
Andreas Hug
10937eb6d8 Replace deprecated mimetype with content_type 
Passing `mimetype` to an HttpResponse object is deprecated
since Django 1.5 and will throw an error in Django 1.7.
`content_type` is supported since Django 1.0.
 2013-11-23 12:18:09 +01:00
A.Sichkar
b79e806961 Ignore requests with wrong data, e.g. {u'indexes': [u'34,32,35,1,,33,7,5,3,29,27,4,11,14,13,31']} 2013-10-31 14:54:28 +02:00
Mathijs de Bruin
1bf1f96703 Remove CSRF exemption where it did not belong. 2013-09-04 22:15:28 +02:00
Brandon Taylor
b3fd59da02 Added an override for the admin add_view to prevent the change form template extends variable from not being populated. 2013-06-20 15:47:41 -04:00
Andrii Kostenko
bb6c625f62 Python 3 support 2013-05-11 15:18:01 +03:00
Brandon Taylor
8bcf2bfb2e Fixed check for sortable inline models which prevented JavaScript from loading correctly. 2013-05-07 09:22:40 -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
32c6f7c034 Fixed unicode support for title context variable in sort view. 
Updated version to 1.4.5.1
Updated README.
 2013-04-30 08:36:46 -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
373197553e Reverted changes that added get_sort_url template tag, as this caused an exception error with inlines. 2013-04-26 13:30:42 -04:00
Smirnov Evgenii
c6e5f9e68e fix unicode verbose_name view in administration 2013-04-23 10:55:25 +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
1c2964c566 Unable to sort in more than one application in project - fixed. 2012-09-24 15:12:07 +03:00
Alexander A. Sosnovskiy
22cd63a4ba It was impossible to override sortable_javascript_includes_template. Fixed. 2012-09-24 12:16:20 +03:00
Alexander A. Sosnovskiy
dfbe590767 Templates can be overriden now. 2012-09-23 21:37:58 +03: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
Dominique Lederer
fef90e6d0c make adminsortable work with descending ordering 2012-03-15 09:58:52 +01:00
Dominique Lederer
cbbcf901fc remove root_path, which produces an error on django 1.4 and also is not used in the template 2012-03-15 09:39:55 +01: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
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
1117941f91 Added KeyError handling on do_sorting_view 2011-10-04 12:01:06 -05:00
Brandon Taylor
e1311fc6f5 Added support for non-numeric primary keys 2011-09-17 16:48:14 -05:00
Brandon Taylor
2f2aeff0ec Fixed if statements so they won't bomb if inline class doesn't subclass sortable. 2011-09-03 22:46:05 -05:00
Brandon Taylor
5d10de5ed4 Added SortableInlineBase class to do subclass checking. 2011-09-03 22:03:40 -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
Brandon Taylor
4e38d8fbe1 Adding files to repo. 2011-08-31 19:51:02 -05:00