X-Git-Url: https://git.mdrn.pl/django-migdal.git/blobdiff_plain/f41fb09cefa2fca8d5c1e9314bcaa3591590a74c..d4b17ad934120d877d606b3130f826273ee49dc2:/migdal/models.py
diff --git a/migdal/models.py b/migdal/models.py
index b3238b7..3890f94 100644
--- a/migdal/models.py
+++ b/migdal/models.py
@@ -12,7 +12,7 @@ from django.db import models
from django.template import loader, Context
from django.utils.translation import ugettext_lazy as _, ugettext
from django_comments_xtd.models import XtdComment
-from markupfield.fields import MarkupField
+from fnpdjango.utils.fields import TextileField
from fnpdjango.utils.models.translation import add_translatable, tQ
from migdal import app_settings
from migdal.fields import SlugNullField
@@ -40,8 +40,8 @@ add_translatable(Category, {
class PublishedEntryManager(models.Manager):
- def get_query_set(self):
- return super(PublishedEntryManager, self).get_query_set().filter(
+ def get_queryset(self):
+ return super(PublishedEntryManager, self).get_queryset().filter(
tQ(published=True)
)
@@ -60,7 +60,7 @@ class Entry(models.Model):
image = models.ImageField(_('image'), upload_to='entry/image/', null=True, blank=True)
promo = models.BooleanField(_('promoted'), default=False)
in_stream = models.BooleanField(_('in stream'), default=True)
- categories = models.ManyToManyField(Category, null=True, blank=True, verbose_name=_('categories'))
+ categories = models.ManyToManyField(Category, blank=True, verbose_name=_('categories'))
first_published_at = models.DateTimeField(_('published at'), null=True, blank=True)
canonical_url = models.URLField(_('canonical link'), null=True, blank=True)
@@ -130,15 +130,17 @@ add_translatable(Entry, languages=app_settings.OPTIONAL_LANGUAGES, fields={
default='n'),
})
+TEXTILE_HELP = _('Use Textile syntax.')
+
add_translatable(Entry, {
'slug': SlugNullField(unique=True, db_index=True, null=True, blank=True),
'title': models.CharField(_('title'), max_length=255, null=True, blank=True),
- 'lead': MarkupField(
- _('lead'), markup_type='textile_pl', null=True, blank=True,
- help_text=_('Use Textile syntax.')),
- 'body': MarkupField(
- _('body'), markup_type='textile_pl', null=True, blank=True,
- help_text=_('Use Textile syntax.')),
+ 'lead': TextileField(
+ _('lead'), markup_type='textile_pl', null=True, blank=True, help_text=TEXTILE_HELP),
+ 'body': TextileField(
+ _('body'), markup_type='textile_pl', null=True, blank=True, help_text=TEXTILE_HELP),
+ 'place': models.CharField(_('place'), null=True, blank=True, max_length=256),
+ 'time': models.CharField(_('time'), null=True, blank=True, max_length=256),
'published': models.BooleanField(_('published'), default=False),
'published_at': models.DateTimeField(_('published at'), null=True, blank=True),
})
@@ -152,6 +154,14 @@ class Attachment(models.Model):
return self.file.url if self.file else ''
+class Photo(models.Model):
+ image = models.ImageField(_('image'), upload_to='entry/photo/')
+ entry = models.ForeignKey(Entry)
+
+ def url(self):
+ return self.image.url if self.image else ''
+
+
def notify_new_comment(sender, instance, created, **kwargs):
if created and isinstance(instance.content_object, Entry) and instance.content_object.author_email:
site = Site.objects.get_current()