diff --git a/HISTORY.rst b/HISTORY.rst index a802356..4a1b3ef 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,12 @@ History ------- +0.3.0 (Unreleased) +++++++++++++++++++ + +* Multisite support +* + 0.2.0 (2014-09-24) ++++++++++++++++++ diff --git a/README.rst b/README.rst index c7db3b2..69147f7 100644 --- a/README.rst +++ b/README.rst @@ -142,6 +142,7 @@ Features * Multilingual support using django-parler * Support for Twitter cards, Open Graph and Google+ snippets meta tags * Optional support for simpler TextField-based content editing +* Multisite support (posts can be visible in one or more Django sites on the same project) Import from Wordpress +++++++++++++++++++++ @@ -164,9 +165,10 @@ Settings * BLOG_IMAGE_FULL_SIZE: Size of the main image when shown on the post detail; it's a dictionary with `size`, `crop` and `upscale` keys; (default: `{'size': '640x120', 'crop': True,'upscale': False}`) -* BLOG_PAGINATION: Number of post per page; (defaul: 10) -* BLOG_LATEST_POSTS: Default number of post in the **Latest post** plugin; (defaul: 5) +* BLOG_PAGINATION: Number of post per page; (default: 10) +* BLOG_LATEST_POSTS: Default number of post in the **Latest post** plugin; (default: 5) * BLOG_POSTS_LIST_TRUNCWORDS_COUNT: Default number of words shown for abstract in the post list; (default: 100) +* BLOG_MULTISITE: Add support for multisite setup Social media tags settings ++++++++++++++++++++++++++ diff --git a/cms_helper.py b/cms_helper.py index c291462..06f5f39 100644 --- a/cms_helper.py +++ b/cms_helper.py @@ -46,6 +46,13 @@ HELPER_SETTINGS = { 'public': True, }, ], + 2: [ + { + 'code': 'en', + 'name': gettext('English'), + 'public': True, + }, + ], 'default': { 'hide_untranslated': False, }, @@ -56,6 +63,9 @@ HELPER_SETTINGS = { {'code': 'it'}, {'code': 'fr'}, ), + 2: ( + {'code': 'en'}, + ), 'default': { 'fallback': 'en', 'hide_untranslated': False, diff --git a/djangocms_blog/__init__.py b/djangocms_blog/__init__.py index b650ceb..d374742 100644 --- a/djangocms_blog/__init__.py +++ b/djangocms_blog/__init__.py @@ -1 +1 @@ -__version__ = '0.2' +__version__ = '0.3.a1' diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py index d3f5b1f..df54af0 100755 --- a/djangocms_blog/admin.py +++ b/djangocms_blog/admin.py @@ -7,7 +7,7 @@ from django.conf import settings from parler.admin import TranslatableAdmin from .models import Post, BlogCategory -from .settings import BLOG_USE_PLACEHOLDER +from .settings import BLOG_USE_PLACEHOLDER, BLOG_MULTISITE class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin): @@ -51,6 +51,8 @@ class PostAdmin(EnhancedModelAdminMixin, FrontendEditableAdmin, fsets = deepcopy(self._fieldsets) if not BLOG_USE_PLACEHOLDER: fsets[0][1]['fields'].append('post_text') + if BLOG_MULTISITE: + fsets[1][1]['fields'][0].append('sites') if request.user.is_superuser: fsets[1][1]['fields'][0].append('author') return fsets diff --git a/djangocms_blog/managers.py b/djangocms_blog/managers.py index 0e9fd70..7f59b22 100644 --- a/djangocms_blog/managers.py +++ b/djangocms_blog/managers.py @@ -1,4 +1,7 @@ # -*- coding: utf-8 -*- +from django.contrib.sites.models import Site +from django.db.models import Q + try: from collections import Counter except ImportError: @@ -6,7 +9,7 @@ except ImportError: from django.db import models from django.utils.timezone import now -from parler.managers import TranslationManager +from parler.managers import TranslationManager, TranslatableQuerySet class TaggedFilterItem(object): @@ -68,29 +71,24 @@ class TaggedFilterItem(object): return sorted(tags, key=lambda x: -x.count) -class GenericDateTaggedManager(TaggedFilterItem, TranslationManager): - use_for_related_fields = True +class GenericDateQuerySet(TranslatableQuerySet): start_date_field = 'date_published' end_date_field = 'date_published_end' publish_field = 'publish' - def get_queryset(self, *args, **kwargs): - try: - return super(GenericDateTaggedManager, self).get_queryset(*args, **kwargs) - except AttributeError: - return super(GenericDateTaggedManager, self).get_query_set(*args, **kwargs) + def on_site(self): + return self.filter(Q(sites__isnull=True) | Q(sites=Site.objects.get_current())) - def published(self, queryset=None): - queryset = self.published_future(queryset) + def published(self): + queryset = self.published_future() if self.start_date_field: return queryset.filter( **{'%s__lte' % self.start_date_field: now()}) else: return queryset - def published_future(self, queryset=None): - if queryset is None: - queryset = self.get_queryset().all() + def published_future(self): + queryset = self.on_site() if self.end_date_field: qfilter = ( models.Q(**{'%s__gte' % self.end_date_field: now()}) @@ -99,9 +97,8 @@ class GenericDateTaggedManager(TaggedFilterItem, TranslationManager): queryset = queryset.filter(qfilter) return queryset.filter(**{self.publish_field: True}) - def archived(self, queryset=None): - if queryset is None: - queryset = self.get_queryset().all() + def archived(self): + queryset = self.on_site() if self.end_date_field: qfilter = ( models.Q(**{'%s__lte' % self.end_date_field: now()}) @@ -110,13 +107,41 @@ class GenericDateTaggedManager(TaggedFilterItem, TranslationManager): queryset = queryset.filter(qfilter) return queryset.filter(**{self.publish_field: True}) - def available(self, queryset=None): - if queryset is None: - queryset = self.get_queryset().all() - return queryset.filter(**{self.publish_field: True}) + def available(self): + return self.on_site().filter(**{self.publish_field: True}) def filter_by_language(self, language): - return self.get_queryset().active_translations(language_code=language) + return self.active_translations(language_code=language).on_site() + + +class GenericDateTaggedManager(TaggedFilterItem, TranslationManager): + use_for_related_fields = True + + queryset_class = GenericDateQuerySet + + def get_queryset(self, *args, **kwargs): + try: + return super(GenericDateTaggedManager, self).get_queryset(*args, **kwargs) + except AttributeError: + return super(GenericDateTaggedManager, self).get_query_set(*args, **kwargs) + + def get_query_set(self, *args, **kwargs): + return self.get_queryset(*args, **kwargs) + + def published(self): + return self.get_queryset().published() + + def available(self): + return self.get_queryset().available() + + def archived(self): + return self.get_queryset().archived() + + def published_future(self): + return self.get_queryset().published_future() + + def filter_by_language(self, language): + return self.get_queryset().filter_by_language(language) def get_months(self, queryset=None): """ @@ -124,7 +149,8 @@ class GenericDateTaggedManager(TaggedFilterItem, TranslationManager): """ if queryset is None: queryset = self.get_queryset() - dates = queryset.values_list(self.start_date_field, flat=True) + queryset = queryset.on_site() + dates = queryset.values_list(queryset.start_date_field, flat=True) dates = [(x.year, x.month) for x in dates] date_counter = Counter(dates) dates = set(dates) diff --git a/djangocms_blog/migrations/0009_auto.py b/djangocms_blog/migrations/0009_auto.py new file mode 100644 index 0000000..73e6fa1 --- /dev/null +++ b/djangocms_blog/migrations/0009_auto.py @@ -0,0 +1,209 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding M2M table for field sites on 'Post' + m2m_table_name = db.shorten_name(u'djangocms_blog_post_sites') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('post', models.ForeignKey(orm[u'djangocms_blog.post'], null=False)), + ('site', models.ForeignKey(orm[u'sites.site'], null=False)) + )) + db.create_unique(m2m_table_name, ['post_id', 'site_id']) + + + def backwards(self, orm): + # Removing M2M table for field sites on 'Post' + db.delete_table(db.shorten_name(u'djangocms_blog_post_sites')) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'cms.cmsplugin': { + 'Meta': {'object_name': 'CMSPlugin'}, + 'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}), + 'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}), + 'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}), + 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}) + }, + 'cms.placeholder': { + 'Meta': {'object_name': 'Placeholder'}, + 'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) + }, + u'cmsplugin_filer_image.thumbnailoption': { + 'Meta': {'ordering': "('width', 'height')", 'object_name': 'ThumbnailOption'}, + 'crop': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'upscale': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'djangocms_blog.authorentriesplugin': { + 'Meta': {'object_name': 'AuthorEntriesPlugin', '_ormbases': ['cms.CMSPlugin']}, + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.User']", 'symmetrical': 'False'}), + u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), + 'latest_posts': ('django.db.models.fields.IntegerField', [], {'default': '5'}) + }, + u'djangocms_blog.blogcategory': { + 'Meta': {'object_name': 'BlogCategory'}, + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['djangocms_blog.BlogCategory']", 'null': 'True', 'blank': 'True'}) + }, + u'djangocms_blog.blogcategorytranslation': { + 'Meta': {'unique_together': "[('language_code', 'slug'), (u'language_code', u'master')]", 'object_name': 'BlogCategoryTranslation', 'db_table': "u'djangocms_blog_blogcategory_translation'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + u'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'null': 'True', 'to': u"orm['djangocms_blog.BlogCategory']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'blank': 'True'}) + }, + u'djangocms_blog.latestpostsplugin': { + 'Meta': {'object_name': 'LatestPostsPlugin', '_ormbases': ['cms.CMSPlugin']}, + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['djangocms_blog.BlogCategory']", 'symmetrical': 'False', 'blank': 'True'}), + u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), + 'latest_posts': ('django.db.models.fields.IntegerField', [], {'default': '5'}), + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['taggit.Tag']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'djangocms_blog.post': { + 'Meta': {'ordering': "('-date_published', '-date_created')", 'object_name': 'Post'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'djangocms_blog_post_author'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'blog_posts'", 'symmetrical': 'False', 'to': u"orm['djangocms_blog.BlogCategory']"}), + 'content': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}), + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'date_published': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'date_published_end': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'enable_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'main_image': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'djangocms_blog_post_image'", 'null': 'True', 'to': "orm['filer.Image']"}), + 'main_image_full': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'djangocms_blog_post_full'", 'null': 'True', 'to': u"orm['cmsplugin_filer_image.ThumbnailOption']"}), + 'main_image_thumbnail': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'djangocms_blog_post_thumbnail'", 'null': 'True', 'to': u"orm['cmsplugin_filer_image.ThumbnailOption']"}), + 'publish': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['sites.Site']", 'null': 'True', 'blank': 'True'}) + }, + u'djangocms_blog.posttranslation': { + 'Meta': {'unique_together': "[('language_code', 'slug'), (u'language_code', u'master')]", 'object_name': 'PostTranslation', 'db_table': "u'djangocms_blog_post_translation'"}, + 'abstract': ('djangocms_text_ckeditor.fields.HTMLField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + u'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'null': 'True', 'to': u"orm['djangocms_blog.Post']"}), + 'meta_description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'meta_keywords': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'meta_title': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'post_text': ('djangocms_text_ckeditor.fields.HTMLField', [], {'default': "''", 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'filer.file': { + 'Meta': {'object_name': 'File'}, + '_file_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'all_files'", 'null': 'True', 'to': u"orm['filer.Folder']"}), + 'has_all_mandatory_data': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), + 'original_filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'owned_files'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_filer.file_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '40', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + u'filer.folder': { + 'Meta': {'ordering': "(u'name',)", 'unique_together': "((u'parent', u'name'),)", 'object_name': 'Folder'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + u'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + u'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'filer_owned_folders'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'children'", 'null': 'True', 'to': u"orm['filer.Folder']"}), + u'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + u'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'filer.image': { + 'Meta': {'object_name': 'Image', '_ormbases': [u'filer.File']}, + '_height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + '_width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'date_taken': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'default_alt_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'default_caption': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + u'file_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['filer.File']", 'unique': 'True', 'primary_key': 'True'}), + 'must_always_publish_author_credit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'must_always_publish_copyright': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'subject_location': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '64', 'null': 'True', 'blank': 'True'}) + }, + u'sites.site': { + 'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"}, + 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'taggit.tag': { + 'Meta': {'object_name': 'Tag'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'}) + } + } + + complete_apps = ['djangocms_blog'] \ No newline at end of file diff --git a/djangocms_blog/models.py b/djangocms_blog/models.py index 1abd84f..8917e83 100644 --- a/djangocms_blog/models.py +++ b/djangocms_blog/models.py @@ -2,6 +2,7 @@ from cms.models import PlaceholderField, CMSPlugin from cmsplugin_filer_image.models import ThumbnailOption from django.conf import settings as dj_settings +from django.contrib.sites.models import Site from django.core.urlresolvers import reverse from django.db import models from django.utils import timezone @@ -89,6 +90,10 @@ class Post(ModelMeta, TranslatableModel): verbose_name=_(u'Enable comments on post'), default=settings.BLOG_ENABLE_COMMENTS ) + sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s'), blank=True, null=True, + help_text=_(u'Select sites in which to show the post. If none is set it will be' + u'visible in all the configured sites.') + ) translations = TranslatedFields( title=models.CharField(_('Title'), max_length=255), diff --git a/djangocms_blog/settings.py b/djangocms_blog/settings.py index 0f16cf5..707bccf 100644 --- a/djangocms_blog/settings.py +++ b/djangocms_blog/settings.py @@ -33,3 +33,4 @@ BLOG_GPLUS_TYPE = getattr(settings, 'BLOG_GPLUS_SCOPE_CATEGORY', 'Blog') BLOG_GPLUS_AUTHOR = getattr(settings, 'BLOG_GPLUS_AUTHOR', 'get_author_gplus') BLOG_ENABLE_COMMENTS = getattr(settings, 'BLOG_ENABLE_COMMENTS', True) BLOG_USE_PLACEHOLDER = getattr(settings, 'BLOG_USE_PLACEHOLDER', True) +BLOG_MULTISITE = getattr(settings, 'BLOG_MULTISITE', True) diff --git a/djangocms_blog/views.py b/djangocms_blog/views.py index 43207a5..59c269c 100644 --- a/djangocms_blog/views.py +++ b/djangocms_blog/views.py @@ -18,10 +18,10 @@ class BaseBlogView(ViewUrlMixin): def get_queryset(self): language = get_language() - manager = self.model._default_manager.active_translations(language_code=language) + queryset = self.model._default_manager.active_translations(language_code=language) if not self.request.user.is_staff: - manager = manager.filter(publish=True) - return manager + queryset = queryset.published() + return queryset.on_site() def render_to_response(self, context, **response_kwargs): response_kwargs['current_app'] = resolve(self.request.path).namespace diff --git a/setup.py b/setup.py index 11d8dd2..1a8e536 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ setup( ], include_package_data=True, install_requires=[ - 'django-parler>=1.0', + 'django-parler>=1.1', 'django-cms>=3.0', 'django-taggit', 'django-filer', diff --git a/tests/__init__.py b/tests/__init__.py index 7db2743..daad139 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,6 +2,7 @@ """ Tests for `djangocms_blog` module. """ +from django.contrib.sites.models import Site import os from cms.utils.i18n import get_language_list @@ -58,6 +59,8 @@ class BaseTest(TestCase): cls.user = create_user('admin', 'admin@admin.com', 'admin', is_staff=True, is_superuser=True) cls.user_staff = create_user('staff', 'staff@admin.com', 'staff', is_staff=True) cls.user_normal = create_user('normal', 'normal@admin.com', 'normal') + cls.site_1 = Site.objects.create(domain='http://example1.com', name='example 1') + cls.site_2 = Site.objects.create(domain='http://example2.com', name='example 2') def setUp(self): activate('en')