Commit graph

122 commits

Author SHA1 Message Date
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
34e5d62245 Fixed merge conflict. 2014-12-22 10:30:56 -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
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
cbce6debb4 Update sample_project for easy testing sortable and nonsortable inlines 2014-11-18 17:04:58 +02:00
Brandon Taylor
daadd190cb Added sortable non-online category example. 2014-11-08 08:49:07 -05:00
Brandon Taylor
42ae56af0b Changes to data from manual testing. 2014-10-24 20:38:13 -04:00
Brandon Taylor
0ac0b56121 Removed unused objects.
Added Person create statements and removed call to fixture data to prevent migration problems across Django versions.
2014-10-24 20:35:55 -04:00
Brandon Taylor
be52851f38 Added new model and data. 2014-10-24 20:35:02 -04:00
Brandon Taylor
ff4bc9b676 Deleted initial data fixture. 2014-10-24 20:34:42 -04:00
Brandon Taylor
5e318551ca Wired up SortableNonInlineCategory model to admin. 2014-10-24 20:34:06 -04:00
Brandon Taylor
6ec43fcd76 Added new model class to demonstrate a sortable model with a foreign key that is not sortable that is not defined as an inline. 2014-10-24 20:32:53 -04:00
Brandon Taylor
651064d3fb Added sortable model that will not be registered as an inline, but will have a non-sortable parent. 2014-10-24 09:15:07 -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
3a3392a7a1 Added additional models for non sortable parent with sortable inlines. 2014-09-21 15:15:40 -04:00
Brandon Taylor
234a0118db Added NonSortableCategory and SortableCategoryWidget model classes.
Wired up NonSortableCategory and inline sortable SortableCategoryWidget to sample project admin.
2014-09-21 15:14:03 -04:00
Brandon Taylor
da20ef0b53 Removed south entirely from project. 2014-09-12 09:35:50 -04:00
Brandon Taylor
82e683756e Fixed string formatting for Python 2.6 in tests.
Updated Travis Python 2.7 version to 2.7.6.
More excludes.
2014-09-12 09:20:36 -04:00
Brandon Taylor
4c2925e1f0 Added SOUTH_TESTS_MIGRATE to settings. 2014-09-12 08:51:36 -04:00
Brandon Taylor
ba552549c2 Fixed south version. 2014-09-06 20:42:53 -04:00
Brandon Taylor
04466602f7 Fixed requirements for Python 2.7 based project. 2014-09-06 20:39:33 -04:00
Brandon Taylor
dd30e39674 Added sample Project using Python 3.4 and Django 1.7. 2014-09-06 20:36:51 -04:00
Brandon Taylor
31780a672a Updated requirements and Travis config. 2014-09-06 15:13:53 -04:00
Brandon Taylor
8df54f43e1 Added basic test of get_next/previous. 2014-09-06 14:53:11 -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
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
Christopher Grebs
e4a79e1d62 Fix python 2.6 compatibility 2014-05-26 14:52:46 +02: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
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
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
Moritz Pfeiffer
629bfb058d Enabled sample project localization to test translations. 2013-12-03 10:43:24 +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
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
Brandon Taylor
71f6be48ad Removed certain database values 2013-06-18 07:51:16 -04:00
Brandon Taylor
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
gladson
27c2ccffc7 add trans block title and block breadcrumbs in change_list 2013-06-08 22:11:48 -07:00
Seth Woodworth
ee7c2bc485 adding south to requirements.txt in the sample project 2013-05-20 20:15:39 -03: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
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
Brandon Taylor
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
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
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
Brandon Taylor
ece9876a47 Minor PEP8 improvements.
Updated version to 1.4.1.
Updated README.
2013-03-15 07:31:14 -04:00
intelliadmin
279477da7b added generic inlines support 2013-03-15 10:10:01 +01: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
cffbd8534e Working on updating documentation and sample project 2013-02-28 22:07:16 -05:00
Brandon Taylor
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
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
754bd78210 Fixed tests for app application. 2012-09-24 16:49:33 +03:00
Brandon Taylor
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
Brandon Taylor
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
Brandon Taylor
e6e0d728d7 Removed initial_data which was breaking unit tests. 2012-04-23 23:11:11 -05:00
Brandon Taylor
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
Brandon Taylor
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
unknown
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
Brandon Taylor
7a242dd41c Refactored classmethods to use aggregation Max instead order_by. 2011-11-16 20:24:33 -06:00
Brandon Taylor
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
Brandon Taylor
638f26df27 Updated version to 1.1.0 2011-10-04 12:36:31 -05:00
Brandon Taylor
e1311fc6f5 Added support for non-numeric primary keys 2011-09-17 16:48:14 -05:00
Brandon Taylor
31f28d5b50 Removed all .pyc files 2011-09-14 09:17:31 -05:00
Brandon Taylor
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
d67112e66d Added login credential information to main README.
Added README for sample_project that also contains login credentials for the impatient.
2011-09-03 22:21:37 -05:00
Brandon Taylor
971de8423c Added support for stacked inline models.
Added highlighting to sorted inline.
Added migrations to add Note class to database.
Added SortableInlineBase for checking type of model specified in inline model subclasses Sortable.
2011-09-03 22:02:48 -05:00
Brandon Taylor
4e38d8fbe1 Adding files to repo. 2011-08-31 19:51:02 -05:00