Changeset 48

Timestamp:

06/07/09 22:57:38 (3 years ago)

Author:

235

Message:

content-areas cache

Location:

plesonet_contentareas/trunk

Files:

• models.py (modified) (5 diffs)
• templatetags/contentareas.py (modified) (1 diff)

plesonet_contentareas/trunk/models.py

@@ -1 +1 @@
 from django.db import models
-from django.contrib import admin
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
@@ -10 +9 @@
 class PublishedContentAreasManager(models.Manager):
     def get_query_set(self):
-        return super(PublishedContentAreasManager, self).get_query_set().filter(is_published = True)
+        return super(PublishedContentAreasManager, self).get_query_set().filter(is_published = True)        
+        #return super(PublishedContentAreasManager, self).get_query_set().filter(is_published = True, language = translation.get_language())
     
     def get_name(self, name):
+        #TODO: you should modify this, if you'd like to add language to cache!
         result = cache.get(CONTENT_AREA_CACHE_KEY + name)
         if result is None:
@@ -18 +19 @@
             cache.set(CONTENT_AREA_CACHE_KEY + name, result, ALL_CONTENT_AREA_CACHE_TIMEOUT)
         return result
-    
+
 class ContentArea(models.Model):
-    EXISTING_NAMES = ( ('contacts_form', 'Contacts form'),
-                       ('article_form', 'Send article from'), )
+    EXISTING_NAMES = ( ('contacts_form', _('Contacts form')),
+                       ('article_form', _('Send article from')), )
     
     name = models.CharField(_('Name'), max_length = 255, choices=EXISTING_NAMES)
+    #language = models.CharField(max_length = 2, choices = settings.LANGUAGES, verbose_name=_('Language'), blank=False, null=False)
     body = models.TextField(_('Body'))
     is_published = models.BooleanField(_('Is published'), default=True)
@@ -29 +31 @@
     objects = models.Manager() # The default manager.
     published = PublishedContentAreasManager()
-    
+
     def save(self, *args, **kwargs):
+        #TODO: you should modify this, if you'd like to add language to cache!
         super(ContentArea, self).save(*args, **kwargs)
         cache.delete(CONTENT_AREA_CACHE_KEY + self.name)
     
     def delete(self):
+        #TODO: you should modify this, if you'd like to add language to cache!
         super(ContentArea, self).delete()
-        cache.delete(CONTENT_AREA_CACHE_KEY + self.name)  
+        cache.delete(CONTENT_AREA_CACHE_KEY + self.name)
 
     class Meta:
@@ -42 +46 @@
         verbose_name = _('content area')
         verbose_name_plural = _('content areas')
+        #ordering = ('name', 'language')
+        #unique_together = (('language', 'name'),)        
         
     def __unicode__(self):
         return self.name
-
-class ContentAreaAdmin(admin.ModelAdmin):
-    list_display = ('name', 'is_published')
-    search_fields = ('title', 'slug', 'annotation', 'body')
-    class Media:
-        js = (   #relative path to MEDIA dir
-                '../media-admin/fckeditor/fckeditor.js',
-                '../media-admin/js/admin/textareas.js', )
-admin.site.register(ContentArea, ContentAreaAdmin) 

plesonet_contentareas/trunk/templatetags/contentareas.py

@@ -10 +10 @@
     
     try:
+        #TODO: you should modify this, if you'd like to add language to cache!
         contentarea = ContentArea.published.get_name(name)
     except: