fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove hotjar.
[wolnelektury.git]
/
src
/
chunks
/
models.py
diff --git
a/src/chunks/models.py
b/src/chunks/models.py
index
7f5410b
..
56166a3
100644
(file)
--- a/
src/chunks/models.py
+++ b/
src/chunks/models.py
@@
-1,7
+1,10
@@
+# 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.conf import settings
+from django.core.cache import cache
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.db import models
from django.utils.translation import ugettext_lazy as _
-from ssify import flush_ssi_includes
class Chunk(models.Model):
class Chunk(models.Model):
@@
-9,7
+12,8
@@
class Chunk(models.Model):
A Chunk is a piece of content associated with a unique key that can be inserted into
any template with the use of a special template tag.
"""
A Chunk is a piece of content associated with a unique key that can be inserted into
any template with the use of a special template tag.
"""
- key = models.CharField(_('key'), help_text=_('A unique name for this chunk of content'), primary_key=True, max_length=255)
+ key = models.CharField(_('key'), help_text=_('A unique name for this chunk of content'), primary_key=True,
+ max_length=255)
description = models.CharField(_('description'), blank=True, max_length=255)
content = models.TextField(_('content'), blank=True)
description = models.CharField(_('description'), blank=True, max_length=255)
content = models.TextField(_('content'), blank=True)
@@
-18,20
+22,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)
@@
-41,5
+40,5
@@
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