From 7dd21f50786ef999aa6ccdc1a2ffc3a1caf5c85c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20St=C4=99pniowski?= <marek@stepniowski.com>
Date: Thu, 4 Sep 2008 14:34:09 +0200
Subject: [PATCH 1/1] Added short_html method to Book model and removed (no
 longer used) book template tag.

---
 catalogue/models.py                           | 25 ++++++++++++++++++-
 catalogue/templatetags/catalogue_tags.py      | 16 ------------
 .../catalogue/{_book.html => book_short.html} |  6 ++---
 templates/catalogue/tagged_book_list.html     |  2 +-
 4 files changed, 28 insertions(+), 21 deletions(-)
 rename templates/catalogue/{_book.html => book_short.html} (85%)

diff --git a/catalogue/models.py b/catalogue/models.py
index 9f035b517..11d1aa77e 100644
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 from django.db import models
-from django.db.models import permalink
+from django.db.models import permalink, Q
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from django.core.files import File
+from django.template.loader import render_to_string
+from django.utils.safestring import mark_safe
 
 from newtagging.models import TagBase
 from newtagging import managers
@@ -71,6 +73,7 @@ class Book(models.Model):
     slug = models.SlugField(_('slug'), unique=True, db_index=True)
     description = models.TextField(_('description'), blank=True)
     created_at = models.DateTimeField(_('creation date'), auto_now=True)
+    _short_html = models.TextField(_('short HTML'))
     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to='books/xml', blank=True)
@@ -81,6 +84,26 @@ class Book(models.Model):
     objects = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     
+    def short_html(self):
+        if len(self._short_html):
+            return mark_safe(self._short_html)
+        else:
+            tags = self.tags.filter(~Q(category__in=('set', 'theme')))
+            tags = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) for tag in tags]
+
+            formats = []
+            if self.html_file:
+                formats.append(u'<a href="%s">Czytaj online</a>' % self.html_file.url)
+            if self.pdf_file:
+                formats.append(u'<a href="%s">Plik PDF</a>' % self.pdf_file.url)
+            if self.odt_file:
+                formats.append(u'<a href="%s">Plik ODT</a>' % self.odt_file.url)
+            
+            self._short_html = render_to_string('catalogue/book_short.html',
+                {'book': self, 'tags': tags, 'formats': formats})
+            self.save()
+            return mark_safe(self._short_html)
+    
     def has_description(self):
         return len(self.description) > 0
     has_description.short_description = _('description')
diff --git a/catalogue/templatetags/catalogue_tags.py b/catalogue/templatetags/catalogue_tags.py
index cf4abe718..20c7abd23 100644
--- a/catalogue/templatetags/catalogue_tags.py
+++ b/catalogue/templatetags/catalogue_tags.py
@@ -117,22 +117,6 @@ def breadcrumbs(tags, search_form=True):
     return context
 
 
-@register.inclusion_tag('catalogue/_book.html')
-def book(request, book):
-    tags = book.tags.filter(~Q(category__in=('set', 'theme')))
-    tags = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) for tag in tags]
-    
-    formats = []
-    if book.html_file:
-        formats.append(u'<a href="%s">Czytaj online</a>' % book.html_file.url)
-    if book.pdf_file:
-        formats.append(u'<a href="%s">Plik PDF</a>' % book.pdf_file.url)
-    if book.odt_file:
-        formats.append(u'<a href="%s">Plik ODT</a>' % book.odt_file.url)
-        
-    return locals()
-
-
 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
diff --git a/templates/catalogue/_book.html b/templates/catalogue/book_short.html
similarity index 85%
rename from templates/catalogue/_book.html
rename to templates/catalogue/book_short.html
index 08cb12c5e..eca279e20 100644
--- a/templates/catalogue/_book.html
+++ b/templates/catalogue/book_short.html
@@ -1,13 +1,13 @@
 <div class="book">
-    {% if request.user.is_authenticated %}
+    {# {% if request.user.is_authenticated %} #}
     <div class="change-sets">
         <a href="{% url catalogue.views.book_sets book.slug %}" class="jqm-trigger">Zestawy</a>
     </div>
-    {% endif %}
+    {# {% endif %} #}
     <div class="book-thumbnail"></div>
     <div class="book-description">
         <h2><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></h2>
         <p style="margin: 0">Formaty: {{ formats|join:", "|safe }}</p>
         <p style="margin: 0">Utwór w kategoriach: {{ tags|join:", "|safe }}</p>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/catalogue/tagged_book_list.html b/templates/catalogue/tagged_book_list.html
index 743035bb8..12c0981dc 100644
--- a/templates/catalogue/tagged_book_list.html
+++ b/templates/catalogue/tagged_book_list.html
@@ -68,7 +68,7 @@
         {% endwith %}
         <ol>
         {% for book in object_list %}
-            <li>{% book request book %}</li>
+            <li>{{ book.short_html }}</li>
         {% endfor %}
         </ol>
         {% paginate %}
-- 
2.20.1