Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
658 commits 7 branches 66 tags 3.4 MiB
Commit graph

365 commits

Author SHA1 Message Date
Brent O'Connor
600aaef926 Changed __unicode__ to __str__ on the CategoryBase class for Python 3 compatibility 2016-02-15 09:51:36 -06:00
Brent O'Connor
32144dd779 Fixed a test: file() doesn't work in Python 3, used open() instead. 2016-02-15 09:31:59 -06:00
Brent O'Connor
6e54f1635d b'' doesn't work under Python 3 in a migration file 2016-02-11 14:53:20 -06:00
Brent O'Connor
1deb79f75b Switched to importing the correct templatetags that got renamed. 2016-02-11 08:49:58 -06:00
Brent O'Connor
93d97d805b Switched form using smart_unicode to smart_text and force_unicode to force_text 2016-02-11 08:49:01 -06:00
Brent O'Connor
337cca5813 Switched from using django.db.models.loading.get_model to using django.apps.apps.get_model 2016-02-10 16:28:40 -06:00
Brent O'Connor
87a22098be Switched form using force_unicode to force_text 2016-02-10 11:58:03 -06:00
Brent O'Connor
c5c459fe42 Ran the 2to3 script 2to3 -w . 2016-02-10 11:47:30 -06:00
Basile LEGAL
188021e568 ugettext may cause circular import 2015-08-19 16:16:33 +02:00
Orestes Sanchez
c7344f6b60 Use singleton registry to import register_fk and register_m2m since they are members on Registry class. 2015-08-12 17:11:08 +02:00
Corey Oordt
cf79d1ba7a Version bump to 1.3 2015-06-09 15:23:43 -05:00
Corey Oordt
addb0e410f defaulting the url prefix to / if it can't find the category tree 2015-06-09 15:23:43 -05:00
Corey Oordt
7f8e303a95 Version 1.3b8: Fixes some migrations 2015-06-09 15:23:43 -05:00
Corey Oordt
02780ba2a1 Version 1.3b7 - fixes registration when there is no app config 2015-06-09 15:23:43 -05:00
Corey Oordt
e841de7aca Version bump to 1.3b6 2015-06-09 15:23:43 -05:00
Corey Oordt
dc99eac19c Fixes potential double imports in dev and test servers 2015-06-09 15:23:43 -05:00
Corey Oordt
8dda6ec87b Fixed a potential issue with double-loading of the dev server 2015-06-09 15:23:43 -05:00
Corey Oordt
7cc0c9987e Version bump to 1.3b5 2015-06-09 15:23:43 -05:00
Corey Oordt
acff7f02a3 Dramatically refactored how migrations are performed to work with Django 1.7 2015-06-09 15:21:38 -05:00
Corey Oordt
28ef4d5565 Updates the existing migration to south_migrations 2015-06-09 15:20:09 -05:00
Corey Oordt
6eb306d715 Version bump to 1.3b4 2015-06-09 15:20:09 -05:00
Corey Oordt
dd60aebf28 Fixes a conflict with treebeard. They stole the name admin_tree_list 2015-06-09 15:20:09 -05:00
Corey Oordt
c6b7cdd520 Changing migration dependency of contenttypes to 0001_initial for support for Django 1.7 2015-06-09 15:20:09 -05:00
Corey Oordt
87f985992b Version bump to 1.3b1 2015-06-09 15:20:09 -05:00
Corey Oordt
69bf632a03 small fixes in some fields 2015-06-09 15:19:36 -05:00
Jose Soares
678e84504d [-] Missed some migrations 2015-06-09 15:17:48 -05:00
Jose Soares
4f51f96d5c [-] Fixed some tree editor and generic collection issues 2015-06-09 15:17:48 -05:00
Jose Soares
e0676d4f25 [-] Migrations updates 2015-06-09 15:17:48 -05:00
Jose Soares
a6443ada85 [-] 1.6/1.7/1.8 compatiable changes (WIP) 2015-06-09 15:17:48 -05:00
Brent O'Connor
74cc9f8346 Fixed the RemovedInDjango19Warning deprecation warning 2015-06-09 15:17:47 -05:00
Brent O'Connor
70abc1c807 Fixed tests so they run under Django 1.7 2015-06-09 15:17:47 -05:00
Brent O'Connor
9822ba8cbb Added the fields property with it set to '__all__' in order to not get the RemovedInDjango18Warning 2015-06-09 15:17:47 -05:00
Brent O'Connor
58abcc7401 Renamed get_query_set to get_queryset to get Django categories to work in Django 1.7. I'm not sure of a good way to make this work in Django 1.6. 2015-06-09 15:17:47 -05:00
Olivier Le Brouster
ab31c29350 i18n: add french translation 2015-05-19 17:02:58 +02:00
Corey Oordt
b75f11213c Version 1.2.3: Added a new way to register models manually 2015-05-05 18:05:37 -05:00
Mirza Delic
f02e06ea99 bootstrap class on table (important for django-suit) 2013-10-20 21:33:59 +02:00
Sina Samavati
703a036bf5 Fix unicode slug issue 2013-09-07 13:16:25 +04:30
Enver Bisevac
451af0e054 Using custom model in CategoryDetailView 2013-07-29 15:24:11 +02:00
Corey Oordt
a254fe9087 Version 1.2.2 2013-07-07 15:54:40 -05:00
Iacopo Spalletti
6c3d305c11 Italian localization 2013-06-05 12:50:17 +02:00
Corey Oordt
7096d8a3eb Fixing migration script for adding fields 2013-05-20 17:42:03 -05:00
Corey Oordt
a232b8e6e3 Version 1.2.1: Fixed i18n and failing test in Django 1.4 2013-03-22 06:25:52 -05:00
Eugene
1d01494ff5 Load I18N templatetags 2013-03-21 02:24:53 +08:00
Corey Oordt
63eefeeaf1 Version bump 1.2 2013-03-20 06:59:15 -05:00
Corey Oordt
c6f122d724 Fixing a few minor Django 1.5 incompatibilities 2013-03-20 06:54:34 -05:00
Corey Oordt
8ce56e8190 Fix for Django 1.5: {% url %} parameter needs to be quoted 2013-03-20 06:54:34 -05:00
Corey Oordt
0be7d5e41f Fixing a merge conflict 2013-03-20 06:54:34 -05:00
Corey Oordt
7232937014 Updating the admin template to support the latest django admin code 2013-03-20 06:54:34 -05:00
winniehell
89c7333306 i18n 2013-03-20 06:54:34 -05:00
winniehell
591680a24e german translation 2013-03-20 06:54:34 -05:00
Corey Oordt
0f2f24d2ce Added customization of admin fieldsets 2013-03-20 06:54:34 -05:00
Corey Oordt
4698f32fc0 Merge pull request #65 from yohanboniface/1.5 
1.5 compat: remove adminmedia templatetag calls
 2013-03-19 06:18:38 -07:00
Brent O'Connor
69565161ff Made it so django-categories works with Django 1.5 and Grappelli 2.4.4 2013-03-18 12:01:10 -07:00
Yohan Boniface
1d7463db2a 1.5 compat: remove adminmedia templatetag calls 
See https://docs.djangoproject.com/en/1.5/releases/1.5/#miscellaneous
 2013-03-01 00:35:33 +01:00
Glen
fb6fb4e6f5 Update categories/templatetags/category_tags.py 
Added NoneType check to display_drilldown_as_ul on line 188 to fix NoneType error.
 2013-02-24 23:16:53 -08:00
Glen
59c3e27134 Update categories/templatetags/category_tags.py 
Added str() to line 49 to fix an error where .strip("'\"") in get_category is getting called on a non-string category_string.
 2013-02-24 14:05:07 -08:00
Brent O'Connor
f55f131655 Fixed an exception error 
Fixed an exception error that occurs when an empty form is submitted for apps that are created using categories.base.CategoryBase.
 2012-10-10 10:23:17 -07:00
Corey Oordt
96748afeb4 Version bump to 1.1.4 2012-08-28 19:41:58 -05:00
Corey Oordt
fbc21bcc39 Merge pull request #50 from epicserve/grappelli 
Made updates so django-categories works with django-grappelli
 2012-08-28 17:38:59 -07:00
Corey Oordt
123459eec1 To satisfy a very demanding and owly jsoa, I removed an unused variable. :P 2012-08-28 08:16:00 -05:00
Corey Oordt
0d167164a1 Updating the signal registration to check for south first and fail silently 2012-08-28 08:00:29 -05:00
Corey Oordt
2b4512beae Version bump to 1.1.3 2012-08-28 06:57:38 -05:00
Corey Oordt
c522ae6d96 Moved the registration of the signal to models.py where it will get executed 2012-08-28 06:57:22 -05:00
Corey Oordt
e41623b4ad Refactored the migration script to use the syncdb signal. The post_migrate signal only fires for south-managed apps, so it isn't as useful. 2012-08-28 06:56:55 -05:00
Brent O'Connor
8a621e9d14 Simplified the assignment of the IS_GRAPPELLI_INSTALLED variable 2012-08-27 16:56:12 -07:00
Brent O'Connor
ff6043d2b3 Updated the code so it will work with or without Grappelli installed 2012-08-27 09:45:26 -07:00
Brent O'Connor
85fb2083bb Made updates so django-categories works with django-grappelli 2012-08-24 13:57:48 -07:00
Corey Oordt
18ab6a49a1 Version bump to 1.1.2 2012-08-18 13:07:04 -04:00
Corey Oordt
0467d30434 Can't use the m2m tests because it conflicts with the fk tests. 2012-08-18 13:06:46 -04:00
Corey Oordt
8be19c893a Placing some south imports into try blocks. 2012-08-18 13:04:58 -04:00
Corey Oordt
7fa53a7003 Capitalizing the various REGISTRY settings 2012-08-18 13:02:15 -04:00
Corey Oordt
d63828ebf6 Refactored the registration of fields from __init__ to a new module. 
It also makes it easier to test.
 2012-08-18 12:53:37 -04:00
Corey Oordt
e0212bb030 Version bump to 1.1.1 final! 2012-08-08 13:43:15 -04:00
Corey Oordt
7d3485309d Version bump to 1.1.1 2012-08-08 11:21:29 -04:00
Corey Oordt
d33d9f9c55 Fixed a bug in the compatibility layer 2012-08-08 11:21:28 -04:00
Jose Soares
8f202fa9e3 Minor tweak to tempatetag tests 2012-07-14 12:59:58 -04:00
Corey Oordt
e588f33c99 Updated read me and version bump to 1.1 2012-07-12 19:31:47 -04:00
Corey Oordt
3a71754a6a Template tags now work with any derivative of CategoryBase. Recognizes the "using" param to specify the model to use. 2012-07-12 19:28:11 -04:00
Corey Oordt
86d9b376e1 Fixed some Django 1.4 cosmetic issues 2012-07-12 19:26:45 -04:00
Corey Oordt
0d254eca63 pep8 cleanup 2012-07-12 19:24:55 -04:00
Corey Oordt
fa470df0a7 Update to template tags to include ways to retrieve an object from a model other than Category. 2012-07-11 07:05:47 -04:00
Corey Oordt
867327e41f Merge pull request #36 from nephila/master 
Document an upgrade path from 1.0.2 to 1.0.3 (issue #35)
 2012-06-06 10:24:21 -07:00
Jose Soares
895a503eda Updated CREDITS, docs and bumped version to 1.0.5 2012-06-04 08:46:22 -04:00
Martin Matusiak
bb544e3034 stylistic fixes and docs 2012-05-16 21:59:58 +02:00
Martin Matusiak
12859ad902 make it optional to register in admin 2012-05-16 15:41:10 +02:00
Martin Matusiak
97df7427a9 use ugettext_lazy 2012-05-11 14:07:01 +02:00
Jose Soares
b49c8d1814 Bunped version to 1.0.4 final 2012-05-03 11:07:55 -04:00
Corey Oordt
3074728ac3 Version bump to 1.0.4b2 2012-04-27 17:10:07 -04:00
Corey Oordt
d1edc78d74 Fixes issue #40 Checks for instance of CategoryBase instead of Category. 
There are still some template tags that won't work with subclasses. Need a better solution for those tags.
 2012-04-27 17:09:51 -04:00
Iacopo Spalletti
8e1ee59722 Documented the upgrade path from 1.0.2 and 1.0.3 plus a small migration to keep things in sync 2012-03-30 13:41:49 +02:00
Corey Oordt
b4a2dbef75 Added Brad Jasper to the credits and updated Jonathan's github account. 2012-03-30 07:06:18 -04:00
Brad Jasper
60907deaf7 Added queryset parameter to ChangeList.get_ordering() 2012-03-28 14:37:34 -04:00
Corey Oordt
ce13a1878f Version bump to 1.0.3 2012-03-28 11:41:52 -04:00
Corey Oordt
5a878c06b6 Fixed another migration 2012-03-28 11:41:39 -04:00
Corey Oordt
3ee569a060 Adding additional migrations to fix potential data corruption when renaming the foreign key 2012-03-28 11:41:17 -04:00
Corey Oordt
43f7ff768d Altering the #10 migration as it caused strange behavior with data. 2012-03-28 11:40:41 -04:00
Corey Oordt
d2f5d4da3f Importing get_model directly from the loading module appears to fix certain edge cases. Version bump to 1.0.2 2012-03-09 08:58:48 -05:00
Corey Oordt
79afb07ced Version bump to 1.0.2 2012-03-06 15:05:38 -05:00
Corey Oordt
6ce2a49d2e Fixed how the activate/deactivate methods in the admin fetched their models. 2012-03-06 15:05:28 -05:00
Corey Oordt
f3cc72a76b Fix for django 1.4 compatibility 2012-03-06 15:05:03 -05:00
Corey Oordt
d194974635 Removed an errant print statement 2012-03-06 15:04:19 -05:00
Corey Oordt
5487447260 Removed the __init__ method for the treechange list. Don't need it and it varies too much by django version. Version bump to 1.0final 2012-02-15 08:56:24 -05:00
Corey Oordt
8abf9840c1 Version bump to 1.0b2 2012-02-15 08:56:24 -05:00
Corey Oordt
6d44ee2d62 The admin prior to 1.4 requires a different result from get_ordering 2012-02-15 08:56:24 -05:00
Corey Oordt
96a3f61928 Allow the setting of a SLUG_TRANSLITERATOR to convert non-ASCII characters to ASCII characters. 2012-02-15 08:56:23 -05:00
Corey Oordt
65ef584cf4 Version bump to 1.0b1 2012-02-15 08:56:23 -05:00
Corey Oordt
768291d720 Moved the base models to base.py and did a few PEP8 cleanups 2012-02-15 08:54:33 -05:00
Corey Oordt
7428f87394 This fixes #31 
* Uses the incorrect version segment. Although it works in 1.4a1, it is not perfect.
 2012-02-15 08:54:33 -05:00
Corey Oordt
3b0cf8da4c Moved the base classes to a new file to isolate them. 2012-02-15 08:54:33 -05:00
Corey Oordt
7f48b70478 Added compatibility with Django 1.4 2012-02-15 08:54:33 -05:00
Corey Oordt
c69047d259 Refactored the admin into a base class for subclasses. 2012-02-15 08:54:33 -05:00
Corey Oordt
3cfc812410 Updated migrations to include a data migration. 2012-02-15 08:54:33 -05:00
Corey Oordt
fdf968fb6e Extracted a base class for categories to allow other apps to make their own independent category-style models. 
* Updated for django-mptt 0.5.2
* Fixed typo in the CategoryRelation field in that the foreign key is called 'story'
* Made the order field non-null and default to 0
* Changed the parent foreign key a TreeForeignKey (for 0.5.2)
* Changed requirements to mptt>=0.5.2
* Added a migration for model changes.
 2012-02-15 08:54:33 -05:00
Corey Oordt
84f84e10c8 Updated the default view caching to 600, which is the django default instead of forcing the views to NEVER cache at all. 2012-02-15 08:54:32 -05:00
Jose Soares
f6c06a2bf6 Addresses issue #27; updated musicgenres.json 2012-02-06 15:44:32 -05:00
Jose Soares
2ea3d2337e Fixes issue #30; includes static directory when packaged 2012-02-06 13:23:51 -05:00
Jose Soares
07f698c638 Moved the editor app so its inside the categories app 2012-01-11 15:22:29 -05:00
Corey Oordt
f6502f45a3 Version bump to 0.8.7 2012-01-04 23:54:21 -05:00
Corey Oordt
416898d2a5 Changed behavior of (de)activating an item within the change form: 
Instead of changing all descendants' active status to the current item's, it will only change the descendants' active status if the item is False.

As it makes sense to have an item active, but its children inactive, it doesn't make sense that an item is inactive, but its descendants are active.

This doesn't change the activate/deactivate admin actions. They will always  affect an item and its descendants.
 2012-01-04 23:53:50 -05:00
Corey Oordt
06713d7803 Bumped the version number to 0.8.6 and altered the get_version a bit. 2012-01-03 09:18:10 -05:00
Corey Oordt
6f6241c264 Altered the field type of the alternate url field from URL to Char. This allows relative urls, instead of full urls. 
Added a migration in case the database complains. Really doesn't do anything on that level
 2012-01-03 09:18:10 -05:00
David Charbonnier
798d20da3d fix missing imports 2011-12-20 08:09:18 +01:00
Corey Oordt
40f4d19b82 Version Bump to 0.8.5 2011-11-03 09:25:29 -04:00
Corey Oordt
e0365e8382 Fixes issue #26 by limiting the slug to the first 50 characters. 2011-11-03 09:24:39 -04:00
Corey Oordt
c0359454ec Bumped version to 0.8.4 2011-10-14 13:50:24 -04:00
Corey Oordt
586fefed79 Added a version check to support Django 1.1 in a core Django function 2011-10-14 13:50:11 -04:00
Corey Oordt
432fccae12 Version bump to 0.8.3 2011-10-13 09:35:13 -04:00
Corey Oordt
ac117419ba Activate and Deactivate of a child no longer (de)activates their parent. 
The query set includes the entire hierarchy. So manually get the categories based on the selected items. Then do them and their children
 2011-10-13 09:35:02 -04:00
Corey Oordt
a883e69451 Remove the delete action from the available actions. 2011-10-13 09:32:55 -04:00
Corey Oordt
fdbb08431e Version bump to 0.8.2 2011-09-04 19:56:22 -04:00
Corey Oordt
801d269c41 Bumped version to 0.8.1 2011-08-29 06:39:27 -04:00
Corey Oordt
2a0b4768a3 Fixes a bug trying to set active on decendants before object is saved. 2011-08-29 06:39:00 -04:00
Corey Oordt
bcd38da766 Version bump. 2011-08-22 09:54:28 -04:00
Corey Oordt
3fe50040c3 Improved Category import. 2011-08-22 09:51:53 -04:00
Corey Oordt
3e8a10ad4e Added an active flag for models 2011-08-22 09:51:11 -04:00
Corey Oordt
8d0b5f942b Version bump to 0.7.2 2011-08-19 10:19:14 -04:00
Corey Oordt
7cb74829ea Added a check in migrate_app to see if the app is a string or not. 2011-08-19 10:13:18 -04:00
Corey Oordt
309accf3e0 Updated the get_version function to be PEP 386 compliant and version bump to 0.7.2b1 2011-08-19 10:05:25 -04:00
Corey Oordt
4d4793db36 PEP 8 formatting 2011-08-19 10:04:39 -04:00
Corey Oordt
5a74525446 Ensure that the slug is always within the 50 characters it needs to be. 2011-08-18 10:31:52 -04:00
Corey Oordt
4107cdd125 Changed the DatabaseError import to be more compatible 2011-08-18 10:31:22 -04:00
Corey Oordt
4d3fdb0ba9 Version bump to 0.7.1 2011-08-03 14:23:52 -04:00
Corey Oordt
3b6d469b89 Due to settings, the migration for the category relations table never would be created. This fixes it 2011-08-03 14:23:30 -04:00
Corey Oordt
fa6e2f1153 Final version: 0.7 2011-08-02 13:46:39 -04:00
Corey Oordt
b1ad054759 Forgot to add the alternate_url to the admin. 2011-08-02 13:43:15 -04:00
Corey Oordt
6aae69b015 Altered the inline template to display the content_object instead of the __unicode__ of the middle table. 2011-08-02 11:25:57 -04:00
Corey Oordt
7bdfb32474 Added a setting for the JAVASCRIPT_URL to make placement of the genericcollections.js file easier 2011-08-02 10:54:35 -04:00
Corey Oordt
e922506fd9 Added compatibility with Django 1.1 by adding missing methods for editor and bumped version to 0.7beta2 2011-08-02 07:08:27 -04:00
Corey Oordt
d3cbb62b5d Added a get_latest_objects_by_category template tag. Might be useful. 2011-08-01 09:14:18 -04:00
Corey Oordt
fdc025d812 Added the ability to add the appropriate fields to a table if configured after an initial syncdb. 2011-08-01 09:12:39 -04:00