X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/fe9a2cc82acbe73117398310b96e5740adee502c..99ff7cb43e460029b1769fc21f704b7614381cf1:/migdal/models.py

diff --git a/migdal/models.py b/migdal/models.py
index 6ba28ee..54091e4 100644
--- a/migdal/models.py
+++ b/migdal/models.py
@@ -2,8 +2,10 @@
 # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
+from datetime import datetime
 from django.conf import settings
 from django.contrib.sites.models import Site
+from django.core.exceptions import ValidationError
 from django.core.mail import send_mail
 from django.db import models
 from django.template import loader, Context
@@ -11,7 +13,8 @@ from django.utils.translation import get_language, ugettext_lazy as _, ugettext
 from django_comments_xtd.models import XtdComment
 from markupfield.fields import MarkupField
 from migdal import app_settings
-from migdal.helpers import add_translatable
+from fnpdjango.utils.models.translation import add_translatable
+from migdal.fields import SlugNullField
 
 class Category(models.Model):
     taxonomy = models.CharField(_('taxonomy'), max_length=32,
@@ -39,7 +42,8 @@ class Entry(models.Model):
     type = models.CharField(max_length=16,
             choices=((t.db, t.slug) for t in app_settings.TYPES),
             db_index=True)
-    date = models.DateTimeField(auto_now_add=True, db_index=True, editable=True)
+    date = models.DateTimeField(_('created at'), auto_now_add=True, db_index=True)
+    changed_at = models.DateTimeField(_('changed at'), auto_now=True, db_index=True)
     author = models.CharField(_('author'), max_length=128)
     author_email = models.EmailField(_('author email'), max_length=128, null=True, blank=True,
             help_text=_('Used only to display gravatar and send notifications.'))
@@ -60,19 +64,21 @@ class Entry(models.Model):
             orig = type(self).objects.get(pk=self.pk)
             published_now = False
             for lc, ln in settings.LANGUAGES:
-                if (not getattr(orig, "published_%s" % lc) and
-                        getattr(self, "published_%s" % lc)):
+                if (getattr(self, "published_%s" % lc)
+                        and getattr(self, "published_at_%s" % lc) is None):
+                    setattr(self, "published_at_%s" % lc, datetime.now())
                     published_now = True
             if published_now:
                 self.notify_author_published()
-
-        # convert blank to null for slug uniqueness check to work
-        for lc, ln in app_settings.OPTIONAL_LANGUAGES:
-            slug_name = "slug_%s" % lc
-            if hasattr(self, slug_name) == u'':
-                setattr(self, slug_name, None)
         super(Entry, self).save(*args, **kwargs)
 
+    def clean(self):
+        for lc, ln in settings.LANGUAGES:
+            if (getattr(self, "published_%s" % lc) and
+                    not getattr(self, "slug_%s" % lc)):
+                raise ValidationError(
+                    ugettext("Published entry should have a slug in relevant language (%s).") % lc)
+
     @models.permalink
     def get_absolute_url(self):
         return ('migdal_entry_%s' % self.type, [self.slug])
@@ -93,9 +99,7 @@ class Entry(models.Model):
             ugettext(u'Your story has been published at %s.') % site.domain,
             mail_text, settings.SERVER_EMAIL, [self.author_email]
         )
-            
-        
-        
+
 
 add_translatable(Entry, languages=app_settings.OPTIONAL_LANGUAGES, fields={
     'needed': models.CharField(_('needed'), max_length=1, db_index=True, choices=(
@@ -104,13 +108,14 @@ add_translatable(Entry, languages=app_settings.OPTIONAL_LANGUAGES, fields={
 })
 
 add_translatable(Entry, {
-    'slug': models.SlugField(unique=True, db_index=True, null=True, blank=True),
+    '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 <a href="http://textile.thresholdstate.com/">Textile</a> syntax.')),
     'body': MarkupField(_('body'), markup_type='textile_pl', null=True, blank=True,
                 help_text=_('Use <a href="http://textile.thresholdstate.com/">Textile</a> syntax.')),
     'published': models.BooleanField(_('published'), default=False),
+    'published_at': models.DateTimeField(_('published at'), null=True, blank=True),
 })