70549b2517
Version bump to 2.0.12.
...
Updated docs.
2016-02-23 13:35:21 -05:00
80719bace9
Merge branch 'master' into develop
2016-02-23 13:29:45 -05:00
bbb88d57ab
Removed extra comma
2016-02-23 12:29:59 -05:00
3ef33043d7
Passed csrf_cookie_name into the changelist_form extra_context to support variable CSRF_COOKIE_NAME
2016-02-23 12:25:18 -05:00
ce091c34c6
Use pk instead of id
2016-02-19 15:27:50 +01:00
c891f25bdf
Merge branch 'develop'
...
Adds custom CSRF_COOKIE_NAME support.
2016-02-16 09:59:50 -05:00
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
5823af8047
Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable
2016-01-27 12:05:12 -05:00
a7a6c12deb
Refactored check for ordering information to keep backwards compatibility with Django 1.5.x
2016-01-27 11:50:42 -05:00
15d8f20178
Fixed merged conflict in __init__.py
...
Removed unused import in admin.py
2016-01-27 11:26:03 -05:00
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
84e42720e7
Fix typo in warning
...
Tabluar -> Tabular
2016-01-12 16:13:15 +01:00
8c30ef88e8
Version bump to 2.0.9
2015-12-23 17:26:53 -05:00
b8a5238a09
Removed print debug statement.
...
Updated readme and generated readme in Restructred Text format for PyPi.
2015-12-23 17:22:53 -05:00
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
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
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
11e445d99e
Variable jQuery path for Django version 1.9 and above
2015-12-08 22:04:05 +01:00
f5c08f4116
Updated readme and version bump to 2.0.7
2015-11-18 09:22:56 -05:00
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
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
455e5304aa
Version bump to 2.0.5.
...
Updated readme.
2015-11-14 21:34:36 -05:00
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
fda8ec917f
Version bump to 2.0.4.
...
Updated readme.
2015-11-12 08:02:49 -05:00
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
5d1a6f5e98
Updated readme.
...
Version bump to 2.0.3
2015-10-20 09:05:52 -04:00
995baee2d3
Fix bug when used with descending order
2015-10-20 14:11:49 +02:00
736454287e
Version bump to 2.0.2.
...
Updated readme.
2015-10-16 09:09:16 -04:00
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
2543f02ce7
Fixed a typp in adminsortable/fields.py comments.
...
Updated readme.
2015-09-07 21:26:36 -04:00
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
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
c50541aa74
Version bump to 1.8.5.
...
Updated readme.
2015-08-24 09:18:54 -04:00
6c5a9058fe
Minor PEP8, text and formatting tweaks.
2015-08-24 08:18:22 -04:00
43fef78876
Work in progress on refactoring the Sortable class into a non-obtrusive mixin.
2015-08-23 22:25:55 -04:00
100177f11d
Version bump to 1.8.4
2015-07-05 23:04:03 -04:00
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
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
ad09081ab4
Added exception handling for get_queryset attribute.
2015-04-08 22:06:14 -04:00
a5c1c53400
Added Polish translations.
...
Version bump to 1.8.2
2015-04-01 12:01:16 -04:00
a34adef6ba
add polish translation
2015-03-30 21:17:49 +02:00
4f16fd266c
Version bump to 1.8.1.
...
Updated readme.
2015-03-24 09:19:58 -04:00
ca6d4ee8ed
Removed debugging information.
2015-03-24 09:13:33 -04:00
4a6a97a663
fix sortable function not found
...
Adminsortable uses django.jQuery
2015-03-24 13:40:07 +01:00
cbc27663a3
Refactored import from generic module to get rid of DeprecationWarning
2015-02-25 19:38:29 +03:00
0af13803fb
Version bump to 1.8.0.
...
Updated readme.
2015-01-12 22:56:38 -05:00
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
a64d86a219
Merged PR 99.
...
Bumped version to 1.7.9.1
2014-12-27 12:45:49 -05:00
da39cf7497
re-enabled href in shared/object_rep.html
2014-12-27 12:18:10 -05:00
d841ebfbfe
removed print statements
2014-12-27 12:12:47 -05:00
740d3fff15
Version bump to 1.7.9.
...
Updated README.
2014-12-22 10:37:44 -05:00
a3c1f4457a
Fixed merge conflicts.
2014-12-22 10:27:46 -05:00
01403f1b8c
Merged pull request 97
2014-12-22 10:25:35 -05:00
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
c7f2d63ec9
calling the correct queryset/get_queryset for VERSION
2014-12-22 14:44:02 +00:00
cf1a2103dd
Updating VERSION comparison to be compatible with all 1.5.x
2014-12-22 14:36:15 +00:00
dfc654121c
Version to 1.7.8.
...
Updated readme.
2014-11-19 11:10:28 -05:00
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
cfcf6b1a46
Make inlines to work corectly with non sortable inlines
2014-11-18 17:04:20 +02:00
a7179fece4
Version bump to 1.7.7.
...
Updated readme with notes on self-referential SortableForeignKeys.
2014-11-03 10:50:02 -05:00
e521d5c8ad
Added extra check for object when sorting self-referential models.
2014-11-03 10:44:11 -05:00
612c4f8031
Added method to check for self-referential sortable foreign keys.
2014-11-03 10:43:41 -05:00
d332563e27
Fixed call to queryset object for Django >= 1.7
2014-11-03 10:43:13 -05:00
13945375f1
Version bump to 1.7.6.
...
Updated readme.
2014-10-24 20:43:12 -04:00
5eaf0987b9
Added a space after the legacy sortable_by parameter to separate it.
2014-10-24 20:31:02 -04:00
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
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
4da0deb503
Updated readme.
...
Version bump to 1.7.5
2014-10-06 09:07:30 -04:00
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
b705c924f0
Fixed comparison operator according to PEP8.
2014-10-04 11:55:12 -04:00
03cfdf2f3d
Version bump to 1.7.4.
...
Updated readme with additional NonSortableParentAdmin related docs.
2014-09-21 19:20:55 -04:00
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
b880018f71
Added css target class to proerly display the 'move' cursor for sortable stacked inlines.
2014-09-21 14:31:46 -04:00
0e993c524c
Removed a stray "TEST 2"
2014-09-19 13:30:46 +02:00
483e834537
Fix formatting string for Python 2.6
2014-09-12 11:04:44 +02:00
4c1ffdebea
Version bump to 1.7.3.
...
Updated readme to document get_next/previous
2014-09-06 15:32:54 -04:00
25ef724e15
Fixed missing kwarg in calls to get_next/previous.
2014-09-06 14:52:09 -04:00
e08077a0b2
PEP8 cleanup.
2014-09-06 14:51:26 -04:00
27686d6f79
Removed unused variable.
2014-09-06 12:38:00 -04:00
1a96bb0d21
Added option to disable sortable foreign key filtering.
2014-09-05 23:07:16 -04:00
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
361305d6a5
Updated Readme.
...
Version bump to 1.7.2.
Merged pull request for commit 4e38d91
2014-09-05 16:37:45 -04:00
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
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
1b2461444b
Merged Python 2.6 comptaibility features.
...
Version bump.
Updated readme.
2014-05-29 10:24:54 -04:00
e19edc7d9e
Merge pull request #81 from EnTeQuAk/feature/python-2.6
...
Fix python 2.6 compatibility
2014-05-29 10:22:15 -04:00
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
357268e9b0
Fix "except"
2014-05-28 16:11:04 +04:00
e4a79e1d62
Fix python 2.6 compatibility
2014-05-26 14:52:46 +02:00
e7e74983a2
Version bump to 1.6.8.
...
Updated README.
2014-05-23 08:05:20 -04:00
f42c4bb329
Add Russian localization
2014-05-20 10:12:20 +04:00
1ebf86b4aa
Updated README.
...
Version bump to 1.6.7
2014-04-08 07:52:26 -04:00
6a09efc8bd
Localized to Spanish.
2014-04-08 01:08:29 -06:00
13549da827
Removed un-needed format specificity.
2014-03-05 09:24:32 -05:00
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
bc536509a4
update new version - translate pt_BR
2014-02-13 02:28:52 -04:00
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
e80a633edb
Updated README.
...
Version bump to 1.6.4
2014-02-05 11:24:48 -05:00
95e21eea5e
Merge branch 'order-subset'
2014-02-05 11:13:58 -05:00
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
e51f7535ca
Added Person model with ordering_subset and initial data.
2014-02-05 09:36:03 -05:00
2ca19f05c1
Updated string formatting on multiple foreign key exception.
2014-02-05 08:26:22 -05:00
cadf41dd1d
Python 2.6.x compatibility fix (unindexed str.format in admin.py
2014-01-13 15:35:23 +02:00
76ff3ae7f9
Merged pull requests 66, 68 and 70.
...
Updated readme.
Version bump to 1.6.3
2013-12-03 07:42:32 -05:00
c128d022c2
Merge pull request #70 from Leftfield/master
...
enable js correctly for generic inlines
2013-12-03 04:36:09 -08:00
644583c08f
enable js correctly for generic inlines
2013-12-03 11:32:31 +00:00
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
ab38988698
Added missing templates
2013-12-03 10:43:00 +01:00
ad73a806b3
Added German translation
2013-11-29 10:50:18 +01:00
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
41be929a7d
Fixed path to jQueryUI in change form.
...
Version bump to 1.6.1
2013-11-25 21:32:34 -05:00
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
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
6195cd7390
Make fast query with "count(*)" instead selecting all data
2013-11-06 13:55:40 +03:00
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
b411576059
Merged README.
...
Included previously forgotten js file.
2013-09-23 08:45:18 -04:00
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
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
542f3fc1fc
Patch needed one more change.
2013-09-04 22:22:19 +02:00
1bf1f96703
Remove CSRF exemption where it did not belong.
2013-09-04 22:15:28 +02:00
53291d2fd7
Add CSRF tweak to admin template.
2013-09-04 22:14:32 +02:00
7f043f588b
Added jQuery tool for doing proper CSRF with AJAX.
2013-09-04 21:57:04 +02:00
2aab380f8a
Bumped version to 1.5.4
2013-08-22 12:18:09 -04:00
89629cd80f
Make inline hint translatable
2013-08-22 17:05:22 +02:00
e22152ba81
Bumped version to 1.5.3
2013-07-19 08:36:06 -05:00
9d128ffc79
Removed executable permissions from many files
2013-07-18 22:45:22 -03:00
83e275bd20
Merged pull request 44.
...
Updated README to include information about backward-incompatible changes in 1.5.2
2013-06-26 10:05:32 -04:00
6f279b1b8e
Fix typo
2013-06-24 18:16:08 +01:00
2354f345dd
Change STATIC_URL to use {% static %} tag
2013-06-24 18:13:36 +01:00
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
8a0a52eca7
Updated version to 1.5.
...
Updated README
2013-06-18 07:52:45 -04:00
49865b4228
Merge pull request #42 from immensa/master
...
add trans - block title and block breadcrumbs in change_list.html
2013-06-09 10:43:14 -07:00
c4bedcd8cf
add trans block title and block breadcrumbs in change_list
2013-06-08 22:19:54 -07:00
ea3e4948a0
Merged pull request for pt_BR locale and added south to requirements.txt
2013-05-20 21:17:29 -04:00
201cc27001
Add locale pt_BR
2013-05-20 13:31:57 -07:00
274a79dcd1
Merged pull request #37 .
...
Updated version to 1.4.8.
Updated README.
2013-05-11 10:37:13 -04:00
bb6c625f62
Python 3 support
2013-05-11 15:18:01 +03:00
8bcf2bfb2e
Fixed check for sortable inline models which prevented JavaScript from loading correctly.
2013-05-07 09:22:40 -04:00
6f2e667e6c
Updated version to 1.4.7.
...
Updated README with JavaScript fixes.
2013-05-04 15:03:30 -04:00
7f3bbbed4c
Updated jQuery to 1.9.1 and jQueryUI to 1.10.2.
...
Added create function handler to unbind events from sortable that were being applied to checkboxes within a sortable item. This was preventing the delete checkbox for inline models from being checked.
Updated JavaScript inlcudes to not include unnecessary files.
2013-05-04 15:00:23 -04:00
a49bb81e1b
Added index error exception handling.
2013-05-03 08:54:02 -04:00
52b9dc693d
Updated version to 1.4.6.
...
Updated README.
2013-05-03 08:52:54 -04:00
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
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
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
b6e68fa367
Removed url template tags and put in relative paths for sorting urls for Django <= 1.4.x and Django 1.5.x compatibility.
2013-04-27 13:10:53 -04:00
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
661f417a7b
Merged pull request from kynazz to add support for unicode in sort view title.
...
Updated readme and version.
2013-04-23 08:05:40 -04:00
b4a9dfe406
change version to 1.4.2
2013-04-23 11:16:58 +04:00
c6e5f9e68e
fix unicode verbose_name view in administration
2013-04-23 10:55:25 +04:00
Brandon Taylor
Adam M. Peacock
endeav
giacomo
Daniel Otero
Marco Badan
Denis Cornehl
zakdoek
Jorge Marques
Brandon Taylor
Tomasz Gabrysiak
flyingeek
ILYA
tomd
mark@ignacio.io
matt-leach
Venelin Stoykov
Jaap Roes
Scott Clark
Evgeniy Kirov
Christopher Grebs
Denis Popov
Eduardo Rivas
gladson
A.Sichkar
João Miguel Neves
Moritz Pfeiffer
Andreas Hug
Alexei
Mathijs de Bruin
Brandon Taylor
Marcelo Jorge Vieira
Adam Gray
gladson
Andrii Kostenko
Smirnov Evgenii