ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #211 from nephila/feature/django_19

Browse source 
Add support for Django 1.9
This commit is contained in:
Iacopo Spalletti 2016-02-27 00:34:58 +01:00
commit fb4bca77d9
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -15,6 +15,7 @@ env:
matrix: matrix:
- TOXENV='pep8' - TOXENV='pep8'
- TOXENV='isort' - TOXENV='isort'
- DJANGO='django19' CMS='cms32'
- DJANGO='django18' CMS='cms32' - DJANGO='django18' CMS='cms32'
- DJANGO='django18' CMS='cms31' - DJANGO='django18' CMS='cms31'
- DJANGO='django17' CMS='cms32' - DJANGO='django17' CMS='cms32'
@ -72,6 +73,10 @@ matrix:
env: DJANGO='django18' CMS='cms31' env: DJANGO='django18' CMS='cms31'
- python: 2.6 - python: 2.6
env: DJANGO='django18' CMS='cms32' env: DJANGO='django18' CMS='cms32'
- python: 2.6
env: DJANGO='django19' CMS='cms32'
- python: 3.3
env: DJANGO='django19' CMS='cms32'
- python: 3.5 - python: 3.5
env: DJANGO='django16' CMS='cms30' env: DJANGO='django16' CMS='cms30'
- python: 3.5 - python: 3.5

1
HISTORY.rst
View file

@ -14,6 +14,7 @@ History
* Fix selecting current menu item according to menu layout * Fix selecting current menu item according to menu layout
* Fix some issues with haystack indexes * Fix some issues with haystack indexes
* Add support for moved ThumbnailOption * Add support for moved ThumbnailOption
* Fix Django 1.9 issues
0.6.3 (2015-12-22) 0.6.3 (2015-12-22)
++++++++++++++++++ ++++++++++++++++++

3
djangocms_blog/admin.py
View file

@ -168,6 +168,9 @@ class BlogConfigAdmin(BaseAppHookConfig, TranslatableAdmin):
@property @property
def declared_fieldsets(self): def declared_fieldsets(self):
return self.get_fieldsets(None)
def get_fieldsets(self, request, obj=None):
""" """
Fieldsets configuration Fieldsets configuration
""" """

4
tests/test_models.py
View file

@ -292,7 +292,7 @@ class ModelsTest(BaseTest):
url_en = reverse( url_en = reverse(
'%s:post-detail' % self.app_config_1.namespace, '%s:post-detail' % self.app_config_1.namespace,
kwargs=kwargs, kwargs=kwargs,
current_app=self.app_config_1 current_app=self.app_config_1.namespace
) )
self.assertEqual(url_en, post.get_absolute_url()) self.assertEqual(url_en, post.get_absolute_url())
@ -305,7 +305,7 @@ class ModelsTest(BaseTest):
url_it = reverse( url_it = reverse(
'%s:post-detail' % self.app_config_1.namespace, '%s:post-detail' % self.app_config_1.namespace,
kwargs=kwargs, kwargs=kwargs,
current_app=self.app_config_1 current_app=self.app_config_1.namespace
) )
self.assertEqual(url_it, post.get_absolute_url()) self.assertEqual(url_it, post.get_absolute_url())
self.assertNotEqual(url_it, url_en) self.assertNotEqual(url_it, url_en)