Merge pull request #211 from nephila/feature/django_19
Add support for Django 1.9
This commit is contained in:
commit
fb4bca77d9
4 changed files with 11 additions and 2 deletions
|
@ -15,6 +15,7 @@ env:
|
|||
matrix:
|
||||
- TOXENV='pep8'
|
||||
- TOXENV='isort'
|
||||
- DJANGO='django19' CMS='cms32'
|
||||
- DJANGO='django18' CMS='cms32'
|
||||
- DJANGO='django18' CMS='cms31'
|
||||
- DJANGO='django17' CMS='cms32'
|
||||
|
@ -72,6 +73,10 @@ matrix:
|
|||
env: DJANGO='django18' CMS='cms31'
|
||||
- python: 2.6
|
||||
env: DJANGO='django18' CMS='cms32'
|
||||
- python: 2.6
|
||||
env: DJANGO='django19' CMS='cms32'
|
||||
- python: 3.3
|
||||
env: DJANGO='django19' CMS='cms32'
|
||||
- python: 3.5
|
||||
env: DJANGO='django16' CMS='cms30'
|
||||
- python: 3.5
|
||||
|
|
|
@ -14,6 +14,7 @@ History
|
|||
* Fix selecting current menu item according to menu layout
|
||||
* Fix some issues with haystack indexes
|
||||
* Add support for moved ThumbnailOption
|
||||
* Fix Django 1.9 issues
|
||||
|
||||
0.6.3 (2015-12-22)
|
||||
++++++++++++++++++
|
||||
|
|
|
@ -168,6 +168,9 @@ class BlogConfigAdmin(BaseAppHookConfig, TranslatableAdmin):
|
|||
|
||||
@property
|
||||
def declared_fieldsets(self):
|
||||
return self.get_fieldsets(None)
|
||||
|
||||
def get_fieldsets(self, request, obj=None):
|
||||
"""
|
||||
Fieldsets configuration
|
||||
"""
|
||||
|
|
|
@ -292,7 +292,7 @@ class ModelsTest(BaseTest):
|
|||
url_en = reverse(
|
||||
'%s:post-detail' % self.app_config_1.namespace,
|
||||
kwargs=kwargs,
|
||||
current_app=self.app_config_1
|
||||
current_app=self.app_config_1.namespace
|
||||
)
|
||||
self.assertEqual(url_en, post.get_absolute_url())
|
||||
|
||||
|
@ -305,7 +305,7 @@ class ModelsTest(BaseTest):
|
|||
url_it = reverse(
|
||||
'%s:post-detail' % self.app_config_1.namespace,
|
||||
kwargs=kwargs,
|
||||
current_app=self.app_config_1
|
||||
current_app=self.app_config_1.namespace
|
||||
)
|
||||
self.assertEqual(url_it, post.get_absolute_url())
|
||||
self.assertNotEqual(url_it, url_en)
|
||||
|
|
Loading…
Reference in a new issue