fixes

[wolnelektury.git] / src / chunks / models.py

diff --git a/src/chunks/models.py b/src/chunks/models.py
index 37b9f60..e1ed94d 100644 (file)
--- a/src/chunks/models.py
+++ b/src/chunks/models.py
@@ -1,11 +1,12 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf import settings
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf import settings

+from django.core.cache import cache

 from django.db import models
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
-from ssify import flush_ssi_includes
+from django.urls import reverse
+from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _

 
 
 class Chunk(models.Model):
 
 
 class Chunk(models.Model):


@@ -23,19 +24,15 @@ class Chunk(models.Model):
         verbose_name = _('chunk')
         verbose_name_plural = _('chunks')
 
         verbose_name = _('chunk')
         verbose_name_plural = _('chunks')
 

-    def __unicode__(self):
+    def __str__(self):

         return self.key
 
     def save(self, *args, **kwargs):
         ret = super(Chunk, self).save(*args, **kwargs)
         return self.key
 
     def save(self, *args, **kwargs):
         ret = super(Chunk, self).save(*args, **kwargs)

-        self.flush_includes()
+        for lc, ln in settings.LANGUAGES:
+            cache.delete('chunk:%s:%s' % (self.key, lc))

         return ret
 
         return ret
 

-    def flush_includes(self):
-        flush_ssi_includes([
-            '/chunks/chunk/%s.%s.html' % (self.key, lang)
-            for lang in [lc for (lc, _ln) in settings.LANGUAGES]])
-

 
 class Attachment(models.Model):
     key = models.CharField(_('key'), help_text=_('A unique name for this attachment'), primary_key=True, max_length=255)
 
 class Attachment(models.Model):
     key = models.CharField(_('key'), help_text=_('A unique name for this attachment'), primary_key=True, max_length=255)


@@ -45,5 +42,48 @@ class Attachment(models.Model):
         ordering = ('key',)
         verbose_name, verbose_name_plural = _('attachment'), _('attachments')
 
         ordering = ('key',)
         verbose_name, verbose_name_plural = _('attachment'), _('attachments')
 

-    def __unicode__(self):
+    def __str__(self):

         return self.key
         return self.key

+
+    def get_absolute_url(self):
+        return reverse('chunks_attachment', args=[self.key, self.attachment.name.rsplit('.', 1)[-1]])
+
+
+class Menu(models.Model):
+    identifier = models.CharField(max_length=255, unique=True)
+
+    def __str__(self):
+        return self.identifier
+
+
+class MenuItem(models.Model):
+    menu = models.ForeignKey(Menu, models.CASCADE)
+    order = models.SmallIntegerField()
+    highlight = models.BooleanField()
+    infopage = models.ForeignKey(
+        'infopages.InfoPage', models.PROTECT, null=True, blank=True)
+    url = models.CharField(max_length=255, blank=True)
+    name = models.CharField(max_length=255, blank=True)
+
+    class Meta:
+        ordering = ('order',)
+
+    @property
+    def final_name(self):
+        if self.name == '-':
+            return mark_safe('<hr>')
+        if self.name:
+            return self.name
+        if self.infopage:
+            return self.infopage.title
+        return ''
+
+    @property
+    def final_link(self):
+        if self.infopage:
+            return self.infopage.get_absolute_url()
+        return self.url
+
+    @property
+    def has_link(self):
+        return self.url or self.infopage