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
ece9876a47
Minor PEP8 improvements.
...
Updated version to 1.4.1.
Updated README.
2013-03-15 07:31:14 -04:00
279477da7b
added generic inlines support
2013-03-15 10:10:01 +01:00
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
cffbd8534e
Working on updating documentation and sample project
2013-02-28 22:07:16 -05:00
8662ebae88
Merged changes from return1-django-v1.5 master
2013-02-28 21:52:07 -05:00
1bf768bf02
Updated version to 1.3.9
2013-01-06 20:40:00 -05:00
c7230002e8
Updated readme.
...
Added jquery.effects.core.js back to static files.
2013-01-06 20:39:05 -05:00
0ae9b5819d
Updated documentation to include gotchas for existing models
2012-12-25 22:10:26 -05:00
fed05de9ad
Update adminsortable/templatetags/django_template_additions.py
...
Added support for django 1.3
2012-11-24 20:06:34 +00:00
1614e77b75
Updated readme and version
2012-11-19 00:10:40 -05:00
d6efa21939
Disable ordering on .add-row.
2012-11-18 15:56:01 +02:00
5ef23ebca7
Fix wrong name for css file.
2012-11-18 15:36:24 +02:00
e206dfc30c
Fixed application of CSS class 'sortable' to stacked inline elements that are sortable which was somehow excluded from the previous release.
2012-11-02 13:49:30 -04:00
9145da6a23
Updated version to 1.3.6, which also somehow didn't make it into the previous release
2012-11-02 13:38:19 -04:00
a66757d728
Fixed the changed to the get_do_sorting_url template tag that somehow didn't make it into the previous release.
2012-11-02 13:33:55 -04:00
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
c9a20b0838
Updated version to 1.3.5
2012-09-30 21:43:04 -04:00
13af5f8142
Fixed exception handling in 'is_sortable' classmethod
2012-09-30 21:41:17 -04:00
04bdb80637
Removed individual jQueryUI JavaScript files in favor of loading jQueryUI from Google Ajax API.
...
Updated jQuery to latest version from Google Ajax API.
Integrated pull-request from BlindHunter to add the ability to override templates on a per-model basis.
Updated README.
2012-09-25 10:52:31 -04:00
1c2964c566
Unable to sort in more than one application in project - fixed.
2012-09-24 15:12:07 +03:00
22cd63a4ba
It was impossible to override sortable_javascript_includes_template. Fixed.
2012-09-24 12:16:20 +03:00
dfbe590767
Templates can be overriden now.
2012-09-23 21:37:58 +03:00
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
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
7a000f1724
Fixed version in __init__
2012-04-23 23:18:37 -05:00
98320aefe9
Incremented version to 1.3.1
2012-04-23 23:13:35 -05:00
4ed0db3304
fixed a typo, regenerated language files
2012-03-15 10:12:28 +01:00
1b98d00a30
removing obsolete css file references (404)
2012-03-15 10:08:06 +01:00
fef90e6d0c
make adminsortable work with descending ordering
2012-03-15 09:58:52 +01:00
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
49b7d7d0e3
Added south field triple to SortableForeignKey field
2012-03-07 21:52:57 -06:00
09f86f83bb
Fixed IndexError
2012-02-24 22:56:47 -06:00
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
fd43051c36
Fixed version tuple.
2011-11-23 08:56:01 -06:00
b16def5c09
Merged changes from sortable-by-refactor.
...
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:27:20 -06:00
789f22b69b
Merge branch 'sortable-by-refactor'
2011-11-22 22:25:45 -06:00
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
fe01094ac6
Merge branch 'master' of github.com:btaylordesign/django-admin-sortable
2011-11-22 21:00:19 -06:00
fd06064d48
Mode switches.
2011-11-22 20:58:09 -06:00
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
fba568399c
Eliminated setting of self.order to 1 if Max returns None, as order has a default value of 1 defined in the field.
2011-11-16 20:50:12 -06:00
7a242dd41c
Refactored classmethods to use aggregation Max instead order_by.
2011-11-16 20:24:33 -06:00
30c19c257a
Incremented version to 1.1.1
2011-11-16 00:50:18 -06:00
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
638f26df27
Updated version to 1.1.0
2011-10-04 12:36:31 -05:00
1117941f91
Added KeyError handling on do_sorting_view
2011-10-04 12:01:06 -05:00
8e23b98e6a
Merge branch 'master' of github.com:btaylordesign/django-admin-sortable
2011-09-24 11:22:23 -05:00
5cfae6f40b
Updated version to 1.0.9
2011-09-24 11:21:57 -05:00
3bc05b0fa5
Back link now returns to change list
2011-09-22 15:54:29 +02:00
def6b940f2
Added i18n files and Dutch translations, also included locale directory in MANIFEST file
2011-09-22 15:53:10 +02:00
612ab190cf
Made new template strings translateable
2011-09-22 15:52:19 +02:00
00bcdc754a
Call block.super for extrahead/extrastyles blocks
2011-09-22 15:23:01 +02:00
cbd612d128
Updated version to 1.0.8
...
Updated README and COPYRIGHT
2011-09-17 17:47:06 -05:00
e214dcd067
Moved jQuery import back to Google CDN.
2011-09-17 17:35:08 -05:00
3aa8b1983f
Merge branch 'master' of github.com:btaylordesign/django-admin-sortable
2011-09-17 16:48:23 -05:00
e1311fc6f5
Added support for non-numeric primary keys
2011-09-17 16:48:14 -05:00
8db3ad417b
Removed print statement in template tag.
...
Increased version to 1.0.7
2011-09-14 23:07:24 -05:00
31f28d5b50
Removed all .pyc files
2011-09-14 09:17:31 -05:00
1c6a0acc7e
Added *.pyc and *.pyo to .gitignore
2011-09-14 09:16:49 -05:00
d91f9fb420
Changed version to 1.0.6
2011-09-14 09:13:02 -05:00
7159b7709a
Added manifest to include static and templates directories in distro and also exclude the sample project from the installed source.
...
Fixes Github issue #1
2011-09-14 09:06:50 -05:00
9fadb30670
Updated version to 1.0.5
2011-09-11 01:26:07 -05:00
6c3e93ded8
Changed name of static media folder from \"media\" to \"static\" for use with django.contrib.staticfiles app.
2011-09-11 01:22:19 -05:00
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
Jaap Roes
Scott Clark
Evgeniy Kirov
Christopher Grebs
Brandon Taylor
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
intelliadmin
Brandon Taylor
Celso Pinto
Ionel Maries Cristian
Alexander A. Sosnovskiy
Dominique Lederer
unknown
Jaap Roes