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

Fix retrieval of categories when adding post

Browse source
This commit is contained in:
Iacopo Spalletti 2015-10-01 23:16:10 +02:00
parent d50c434833
commit 9a3761a73a
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
djangocms_blog/forms.py
View file

@ -6,7 +6,7 @@ from django.conf import settings
from parler.forms import TranslatableModelForm from parler.forms import TranslatableModelForm
from taggit_autosuggest.widgets import TagAutoSuggest from taggit_autosuggest.widgets import TagAutoSuggest
from .models import BlogCategory, Post from .models import BlogCategory, BlogConfig, Post
class LatestEntriesForm(forms.ModelForm): class LatestEntriesForm(forms.ModelForm):
@ -35,7 +35,8 @@ class PostAdminForm(TranslatableModelForm):
if getattr(self.instance, 'app_config_id', None): if getattr(self.instance, 'app_config_id', None):
qs = qs.namespace(self.instance.app_config.namespace) qs = qs.namespace(self.instance.app_config.namespace)
elif 'initial' in kwargs and 'app_config' in kwargs['initial']: elif 'initial' in kwargs and 'app_config' in kwargs['initial']:
qs = qs.namespace(kwargs['initial']['app_config']) config = BlogConfig.objects.get(pk=kwargs['initial']['app_config'])
qs = qs.namespace(config.namespace)
if 'categories' in self.fields: if 'categories' in self.fields:
self.fields['categories'].queryset = qs self.fields['categories'].queryset = qs

8
tests/test_models.py
View file

@ -128,6 +128,14 @@ class AdminTest(BaseTest):
fsets = post_admin.get_fieldsets(request) fsets = post_admin.get_fieldsets(request)
self.assertTrue('author' in fsets[1][1]['fields'][0]) self.assertTrue('author' in fsets[1][1]['fields'][0])
with self.login_user_context(self.user):
request = self.get_request('/', 'en', user=self.user, path=r'/en/blog/?app_config=%s' % self.app_config_1.pk)
msg_mid = MessageMiddleware()
msg_mid.process_request(request)
post_admin = admin.site._registry[Post]
response = post_admin.add_view(request)
self.assertContains(response, '<option value="1">category 1</option>')
def test_admin_auto_author(self): def test_admin_auto_author(self):
pages = self.get_pages() pages = self.get_pages()
data = deepcopy(self._post_data[0]['en']) data = deepcopy(self._post_data[0]['en'])