FIX: Problem z zapisywaniem MP3 i OGG oraz odświeżaniem short_html przy uaktualnianiu...

[wolnelektury.git] / apps / sponsors / models.py

diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py
index ffad8e7..1df990f 100644 (file)
--- a/apps/sponsors/models.py
+++ b/apps/sponsors/models.py
@@ -1,5 +1,8 @@
 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 django.template.loader import render_to_string
+
+from sponsors.fields import JSONField

 
 
 class Sponsor(models.Model):
 
 
 class Sponsor(models.Model):


@@ -18,17 +21,35 @@ class Sponsor(models.Model):
             return self.name
 
 
             return self.name
 
 

-class SponsorGroup(models.Model):
+class SponsorPage(models.Model):

     name = models.CharField(_('name'), max_length=120)
     name = models.CharField(_('name'), max_length=120)

-    order = models.IntegerField(_('order'), default=0)
-    column_width = models.PositiveIntegerField(_('column width'))
-    sponsor_ids = models.CommaSeparatedIntegerField(_('sponsors'), max_length=255)
+    column_width = models.PositiveIntegerField(_('column width'), default=200)
+    sponsors = JSONField(_('sponsors'), default={})
+    _html = models.TextField(blank=True, editable=False)
+    
+    def populated_sponsors(self):
+        result = []
+        for column in self.get_sponsors_value():
+            result_group = {'name': column['name'], 'sponsors': []}
+            sponsor_objects = Sponsor.objects.in_bulk(column['sponsors'])
+            for sponsor_pk in column['sponsors']:
+                try:
+                    result_group['sponsors'].append(sponsor_objects[sponsor_pk])
+                except KeyError:
+                    pass
+            result.append(result_group)
+        return result

     
     

-    def sponsors(self):
-        ids = [int(pk) for pk in self.sponsor_ids.split(',')]
-        result = Sponsor.objects.in_bulk(ids)
-        return [result[pk] for pk in ids]
-    sponsors.changes_data = False
+    def html(self):
+        return self._html
+    html = property(fget=html)
+
+    def save(self, *args, **kwargs):
+        self._html = render_to_string('sponsors/page.html', {
+            'column_width': self.column_width,
+            'sponsors': self.populated_sponsors(),
+        })
+        return super(SponsorPage, self).save(*args, **kwargs)

     
     def __unicode__(self):
         return self.name
     
     def __unicode__(self):
         return self.name