Commit Graph

65 Commits (8df41a9533623a9953ec24288db08a484d4cdb8a)

Author SHA1 Message Date
Brandon Taylor f5cda8ded9 Updated Font Awesome to 4.6.3 2016-08-08 21:35:43 -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
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
Venelin Stoykov 262ec1b49b Fix stacked inline icons placement
Fixes #138
2016-06-23 18:25:11 +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
Venelin Stoykov 7c235308b8 Fix UI when djangocms-admin-style is used 2016-06-15 17:53:35 +03: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 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
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
Daniel Otero 11e445d99e Variable jQuery path for Django version 1.9 and above 2015-12-08 22:04:05 +01: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
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 ca6d4ee8ed Removed debugging information. 2015-03-24 09:13:33 -04:00
mark@ignacio.io da39cf7497 re-enabled href in shared/object_rep.html 2014-12-27 12:18:10 -05:00
Brandon Taylor 01403f1b8c Merged pull request 97 2014-12-22 10:25:35 -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 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
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 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 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
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
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
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
Mathijs de Bruin 542f3fc1fc Patch needed one more change. 2013-09-04 22:22:19 +02:00
Mathijs de Bruin 53291d2fd7 Add CSRF tweak to admin template. 2013-09-04 22:14:32 +02:00
Andreas Hug 89629cd80f Make inline hint translatable 2013-08-22 17:05:22 +02:00
Marcelo Jorge Vieira 9d128ffc79 Removed executable permissions from many files 2013-07-18 22:45:22 -03:00
Adam Gray 6f279b1b8e Fix typo 2013-06-24 18:16:08 +01:00
Adam Gray 2354f345dd Change STATIC_URL to use {% static %} tag 2013-06-24 18:13:36 +01:00
gladson c4bedcd8cf add trans block title and block breadcrumbs in change_list 2013-06-08 22:19:54 -07:00
Brandon Taylor 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
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 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
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
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 8662ebae88 Merged changes from return1-django-v1.5 master 2013-02-28 21:52:07 -05:00
Brandon Taylor 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
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
Brandon Taylor 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
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