Commit Graph

256 Commits (f2f5daf83133ff8c5d8f770b6acbfe21e2b3d555)

Author SHA1 Message Date
Anton Shevchenko f2f5daf831 Use 'update_fields' to limit the object's save() method to just the order field, so that other fields are not accidentally overwritten with stale data. 2017-03-08 22:14:48 -05:00
Igor Sobolev 12fbb62302 Proper context and breadcrumbs 2016-11-02 12:47:36 -04:00
Brandon Taylor b96896d890 Merge branch 'develop' 2016-10-30 11:39:17 -04: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
Steven Wood 686ddae81c Raise NotImplementedError instead of NotImplemented 2016-10-23 10:20:45 -04:00
Brandon Taylor 3f12b10926 Changed version check back to old-style for backwards compatibility. 2016-10-12 22:23:38 -04:00
Brandon Taylor 32726cdcae Version 2.0.20
Bumped version up.
Updated README.
2016-10-12 06:09:49 -04:00
Ruben Dura Tari 3c2935776e Enables support for primary keys that are not AutoFields.
Specially useful when using UUIDs as primary keys.
2016-10-11 18:53:45 +01:00
Brandon Taylor 66e63a29c2 Version bump to 2.0.19.
Updated readme.
2016-08-08 21:48:11 -04:00
Brandon Taylor f5cda8ded9 Updated Font Awesome to 4.6.3 2016-08-08 21:35:43 -04:00
Brandon Taylor b29590a185 Minor formatting tweaks 2016-08-08 21:34:53 -04:00
Brandon Taylor ec03f8d17b Updated change_list template for Django 1.10 compatibility. 2016-08-08 21:34:41 -04:00
Brandon Taylor 5566faed5b Update sortable inline templates for Django 1.10.x compatibility. 2016-08-08 20:36:35 -04: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
Brandon Taylor fc58ee51f0 Updated readme.
Version bump to 2.0.18
2016-07-09 18:26:00 -04:00
Steven H Johnson 76a49cc082 Fix missing admin icon for django 1.9 2016-07-09 16:26:45 -04:00
Venelin Stoykov c59617e004 Fix sorted icons placement
- Move icons to the header of the row. By this way they will play nicely with custom
admin themes (like djangocms-admin-style).
- Also fix icons for Django 1.5 (now the admin looks the same as with Django >= 1.6)
2016-06-24 14:04:06 +03:00
Brandon Taylor ee857c7403 [bt] Release 2.0.17
Merged Pull Requests #146 and #147
2016-06-23 22:04:07 -04:00
Brandon Taylor 54482b3bb3 Merge branch 'master' into develop 2016-06-23 21:48:45 -04:00
Brandon Taylor 7788b8e405 Merge pull request #146 from MagicSolutions/fix/change_form_template-selection
Play nice with other apps which dynamically choose `change_form_template`
2016-06-23 18:36:02 -07:00
Venelin Stoykov 262ec1b49b Fix stacked inline icons placement
Fixes #138
2016-06-23 18:25:11 +03:00
Venelin Stoykov 2697422497 Play nice with other apps which dynamically choose `change_form_template`
If other app admin class is using `property` for `change_form_template` adminsortable fails.
2016-06-23 16:02:01 +03: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 344927a393 Version 2.0.16 Changes
Updated readme.
Version bump to 2.0.16
2016-06-15 20:57:10 -04:00
Brandon Taylor 6ffbb9b358 Merge branch 'master' into develop 2016-06-15 20:40:48 -04:00
Brandon Taylor 79f5aeded2 Merge pull request #141 from MagicSolutions/feature/djangocms-admin-style
Fix UI when djangocms-admin-style is used
2016-06-15 17:34:03 -07:00
Brandon Taylor 307db84b66 Testing admin url cleanup 2016-06-15 20:25:56 -04:00
Venelin Stoykov 7c235308b8 Fix UI when djangocms-admin-style is used 2016-06-15 17:53:35 +03:00
Venelin Stoykov fb6e1118db Simplify SortableAdmin.get_urls
Preserve compatibility
2016-06-15 16:54:07 +03:00
Brandon Taylor be29289d30 Bumping version due to PyPi error during upload. 2016-03-14 11:40:25 -04:00
Brandon Taylor 557d2d457d Fixed merge conflicts. 2016-03-14 11:36:41 -04:00
Brandon Taylor b888063f11 Fixed bad merge. 2016-03-14 11:12:01 -04:00
Brandon Taylor f004d97bf1 Refactored exception handling for order_field_name 2016-03-14 11:09:18 -04:00
Brandon Taylor ada42c84de Version bump to 2.0.13.
Updated readme.
Slight refactor on JS to avoid extra function call.
Fixed missing semicolon.
2016-03-10 16:41:23 -05:00
Brandon Taylor f44220c3de Fixed missing semicolon. 2016-03-10 16:36:26 -05:00
Brandon Taylor 837a25268d [bt] Updated selector for index value on sortable tabular inlines. 2016-03-10 16:21:08 -05:00
Patrick 33074d8f65 js: fix indexes finding for tabular inlines
js: fix indexes finding for tabular inlines

Not sure with but unless I change the code the line 30 finds <i> tags instead of the input.
2016-03-10 14:43:44 -05:00
Brandon Taylor 70549b2517 Version bump to 2.0.12.
Updated docs.
2016-02-23 13:35:21 -05:00
Brandon Taylor 80719bace9 Merge branch 'master' into develop 2016-02-23 13:29:45 -05:00
Adam M. Peacock bbb88d57ab Removed extra comma 2016-02-23 12:29:59 -05:00
Adam M. Peacock 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
endeav ce091c34c6 Use pk instead of id 2016-02-19 15:27:50 +01:00
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 8c30ef88e8 Version bump to 2.0.9 2015-12-23 17:26:53 -05:00