Commit Graph

251 Commits (8df41a9533623a9953ec24288db08a484d4cdb8a)

Author SHA1 Message Date
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
Marco Badan a5496fed0b Remove `load url from future`
`{% load url from future %}` can be removed from templates since Django 1.5 and it will be removed from Django in 1.9

https://docs.djangoproject.com/en/1.8/releases/1.5/#django-1-5-release-notes
https://docs.djangoproject.com/en/dev/releases/1.7/#loading-ssi-and-url-template-tags-from-future-library
2015-11-14 14:04:56 +01:00
Brandon Taylor fda8ec917f Version bump to 2.0.4.
Updated readme.
2015-11-12 08:02:49 -05:00
Denis Cornehl 4d8091bc5e fix slow get_is_sortable when using with inline admins
the first `if` call did execute the whole `select` query with (perhaps)
millions of records in them, even though the only result needed here
is one record.

The acually used queryset later will be filtered by the parent-model.
2015-11-11 16:03:19 +01:00
Brandon Taylor 5d1a6f5e98 Updated readme.
Version bump to 2.0.3
2015-10-20 09:05:52 -04:00
zakdoek 995baee2d3 Fix bug when used with descending order 2015-10-20 14:11:49 +02:00
Brandon Taylor 736454287e Version bump to 2.0.2.
Updated readme.
2015-10-16 09:09:16 -04:00
Jorge Marques feeb4e7910 Updates the stacked and tabular inline templates so that the
"show_change_link" option is taken into account, mimicking the
corresponding templates in Django 1.8
2015-10-13 18:41:51 +01: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 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 43fef78876 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. 2015-08-23 22:25:55 -04:00
Brandon Taylor 100177f11d Version bump to 1.8.4 2015-07-05 23:04:03 -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 ef05c0f7cb Version bump to 1.8.3.
Updated readme with 1.8.3 information.
Updated travis configuration to remove deprecated config settings.
2015-04-08 22:16:20 -04:00
Brandon Taylor ad09081ab4 Added exception handling for get_queryset attribute. 2015-04-08 22:06:14 -04:00
Brandon Taylor a5c1c53400 Added Polish translations.
Version bump to 1.8.2
2015-04-01 12:01:16 -04:00
Tomasz Gabrysiak a34adef6ba add polish translation 2015-03-30 21:17:49 +02:00
Brandon Taylor 4f16fd266c Version bump to 1.8.1.
Updated readme.
2015-03-24 09:19:58 -04:00
Brandon Taylor ca6d4ee8ed Removed debugging information. 2015-03-24 09:13:33 -04:00
flyingeek 4a6a97a663 fix sortable function not found
Adminsortable uses django.jQuery
2015-03-24 13:40:07 +01:00
ILYA cbc27663a3 Refactored import from generic module to get rid of DeprecationWarning 2015-02-25 19:38:29 +03:00
Brandon Taylor 0af13803fb Version bump to 1.8.0.
Updated readme.
2015-01-12 22:56:38 -05: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 a64d86a219 Merged PR 99.
Bumped version to 1.7.9.1
2014-12-27 12:45:49 -05:00
mark@ignacio.io da39cf7497 re-enabled href in shared/object_rep.html 2014-12-27 12:18:10 -05:00
mark@ignacio.io d841ebfbfe removed print statements 2014-12-27 12:12:47 -05:00
Brandon Taylor 740d3fff15 Version bump to 1.7.9.
Updated README.
2014-12-22 10:37:44 -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 e0b38fb705 Using __class__ to get model class as model is not an attribute of class Meta in Django 1.5.x 2014-12-22 14:57:17 +00: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 dfc654121c Version to 1.7.8.
Updated readme.
2014-11-19 11:10:28 -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 cfcf6b1a46 Make inlines to work corectly with non sortable inlines 2014-11-18 17:04:20 +02: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 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 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 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 03cfdf2f3d Version bump to 1.7.4.
Updated readme with additional NonSortableParentAdmin related docs.
2014-09-21 19:20:55 -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 b880018f71 Added css target class to proerly display the 'move' cursor for sortable stacked inlines. 2014-09-21 14:31:46 -04:00
Jaap Roes 0e993c524c Removed a stray "TEST 2" 2014-09-19 13:30:46 +02:00
Jaap Roes 483e834537 Fix formatting string for Python 2.6 2014-09-12 11:04:44 +02:00
Brandon Taylor 4c1ffdebea Version bump to 1.7.3.
Updated readme to document get_next/previous
2014-09-06 15:32:54 -04:00
Brandon Taylor 25ef724e15 Fixed missing kwarg in calls to get_next/previous. 2014-09-06 14:52:09 -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 1a96bb0d21 Added option to disable sortable foreign key filtering. 2014-09-05 23:07:16 -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
Brandon Taylor 361305d6a5 Updated Readme.
Version bump to 1.7.2.
Merged pull request for commit 4e38d91.
Removed version specifications from requirements.txt in sample project.
2014-09-05 16:37:45 -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 5e307d687b Version bump to 1.7.1.
Added Brazilian Portugese locale.
Fixed minor css scoping issue that caused stacked template items that were sortable to not display the 'move' cusor type.
Fixed comment line in manage.py for PEP8.
2014-08-21 22:14:36 -04:00
Brandon Taylor 1b2461444b Merged Python 2.6 comptaibility features.
Version bump.
Updated readme.
2014-05-29 10:24:54 -04: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
Brandon Taylor 6f25684e35 Version bump to 1.6.9.
Merged pull request from @kirov to fix multiple exception handling.
2014-05-28 08:15:39 -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 e7e74983a2 Version bump to 1.6.8.
Updated README.
2014-05-23 08:05:20 -04:00
Denis Popov f42c4bb329 Add Russian localization 2014-05-20 10:12:20 +04:00
Brandon Taylor 1ebf86b4aa Updated README.
Version bump to 1.6.7
2014-04-08 07:52:26 -04:00
Eduardo Rivas 6a09efc8bd Localized to Spanish. 2014-04-08 01:08:29 -06: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
gladson bc536509a4 update new version - translate pt_BR 2014-02-13 02:28:52 -04:00
Brandon Taylor 53df734e15 Fixed jQuery namespace on inline model JavaScript includes.
Version bump to 1.6.5.
Updated readme.
2014-02-12 16:22:04 -05:00
Brandon Taylor e80a633edb Updated README.
Version bump to 1.6.4
2014-02-05 11:24:48 -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
Brandon Taylor 2ca19f05c1 Updated string formatting on multiple foreign key exception. 2014-02-05 08:26:22 -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
Brandon Taylor 76ff3ae7f9 Merged pull requests 66, 68 and 70.
Updated readme.
Version bump to 1.6.3
2013-12-03 07:42:32 -05:00
Brandon Taylor c128d022c2 Merge pull request #70 from Leftfield/master
enable js correctly for generic inlines
2013-12-03 04:36:09 -08:00
João Miguel Neves 644583c08f enable js correctly for generic inlines 2013-12-03 11:32:31 +00:00
Moritz Pfeiffer 818a231a1a Reordering with unsaved inlines is faulty and counter intuitive.
In this commit I added a javascript alert that prompts the user to save their changes before reordering if unsaved inlines are detected.
Please review and let me know if this in compliance with your guidelines.
2013-12-03 10:45:17 +01:00
Moritz Pfeiffer ab38988698 Added missing templates 2013-12-03 10:43:00 +01:00
Moritz Pfeiffer ad73a806b3 Added German translation 2013-11-29 10:50:18 +01: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
Brandon Taylor 30f13aedff Added latest jQuery UI and added namespace fix so that jQueryUI can leverage jQuery included with Django admin.
Merged pull request 62 to replace depracated mimetype handling.
Bumped version to 1.6 to coincide with the release of Django 1.6.
Merged pull request 59 to improve query count speed by leveraging .count() instead of len().
Merged pull request 58 to ignore bad indexes.
2013-11-23 09:32:51 -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
Alexei 6195cd7390 Make fast query with "count(*)" instead selecting all data 2013-11-06 13:55:40 +03: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
Brandon Taylor b411576059 Merged README.
Included previously forgotten js file.
2013-09-23 08:45:18 -04: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 1bf917da61 Bumped version to 1.5.4.
Replaced jQuery loaded from CDN with jQuery included with Django Admin.
Replaced jQuery UI from CDN with django.jQuery namespaced jQueryUI 1.8.11.
Implemented static includes using {% static %} template tag.
Removed documentation concerning override of sortable inlines whose parent doesn't inherit from sortable until a consistent workaround can be achieved.
Added CSRF protection for sort views.
2013-09-05 14:09:50 -04:00