Commit graph

610 commits

Author SHA1 Message Date
mark@ignacio.io
da39cf7497 re-enabled href in shared/object_rep.html 2014-12-27 12:18:10 -05:00
mark@ignacio.io
d841ebfbfe removed print statements 2014-12-27 12:12:47 -05:00
Brandon Taylor
936ac0fd34 Merge pull request #98 from matt-leach/master
adding travis 1.5.10 test back in
2014-12-22 15:59:47 -05:00
matt-leach
160a65dae7 adding travis 1.5.10 test back in 2014-12-22 19:45:12 +00:00
Brandon Taylor
740d3fff15 Version bump to 1.7.9.
Updated README.
2014-12-22 10:37:44 -05: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
e83e31cb22 Merge pull request #97 from matt-leach/master
Django 1.5.x compatibility updates
2014-12-22 10:19:32 -05:00
matt-leach
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
matt-leach
c7f2d63ec9 calling the correct queryset/get_queryset for VERSION 2014-12-22 14:44:02 +00:00
matt-leach
cf1a2103dd Updating VERSION comparison to be compatible with all 1.5.x 2014-12-22 14:36:15 +00:00
Brandon Taylor
dfc654121c Version to 1.7.8.
Updated readme.
2014-11-19 11:10:28 -05:00
Brandon Taylor
ebda962dfe Update Travis config. 2014-11-19 11:07:05 -05:00
Brandon Taylor
7636e0e729 Update Travis config. 2014-11-19 11:05:44 -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
Brandon Taylor
81fc032c8b Merge pull request #96 from MagicSolutions/fix_js_for_inlines
Make inlines to work corectly with non sortable inlines
2014-11-18 10:17:12 -05:00
Venelin Stoykov
cbce6debb4 Update sample_project for easy testing sortable and nonsortable inlines 2014-11-18 17:04:58 +02:00
Venelin Stoykov
cfcf6b1a46 Make inlines to work corectly with non sortable inlines 2014-11-18 17:04:20 +02:00
Brandon Taylor
daadd190cb Added sortable non-online category example. 2014-11-08 08:49:07 -05:00
Brandon Taylor
bcd328a101 Added child to str representation of self-referential model. 2014-11-03 11:19:59 -05:00
Brandon Taylor
c855ad8be3 Updated version in readme. 2014-11-03 10:51:41 -05:00
Brandon Taylor
a7179fece4 Version bump to 1.7.7.
Updated readme with notes on self-referential SortableForeignKeys.
2014-11-03 10:50:02 -05:00
Brandon Taylor
a48cf00396 Added migrations, fixed queryset call and fixed meta inheritance for self-referential sample model. 2014-11-03 10:45:50 -05:00
Brandon Taylor
7c60d89c71 Data changes from testing. 2014-11-03 10:44:31 -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
612c4f8031 Added method to check for self-referential sortable foreign keys. 2014-11-03 10:43:41 -05:00
Brandon Taylor
d332563e27 Fixed call to queryset object for Django >= 1.7 2014-11-03 10:43:13 -05:00
Brandon Taylor
13945375f1 Version bump to 1.7.6.
Updated readme.
2014-10-24 20:43:12 -04: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
5eaf0987b9 Added a space after the legacy sortable_by parameter to separate it. 2014-10-24 20:31:02 -04:00
Brandon Taylor
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
Brandon Taylor
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
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
4da0deb503 Updated readme.
Version bump to 1.7.5
2014-10-06 09:07:30 -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
b705c924f0 Fixed comparison operator according to PEP8. 2014-10-04 11:55:12 -04:00
Brandon Taylor
9935f65ca0 Update README.md 2014-09-21 19:35:21 -04:00
Brandon Taylor
13c84e8d0b Updated readme docs for migrations. 2014-09-21 19:28:33 -04:00
Brandon Taylor
03cfdf2f3d Version bump to 1.7.4.
Updated readme with additional NonSortableParentAdmin related docs.
2014-09-21 19:20:55 -04:00
Brandon Taylor
588fc7a4cd Added new models and model admins to Python3 sample project. 2014-09-21 18:45:46 -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
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
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