From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Wed, 31 Aug 2011 09:58:29 +0000 (+0200)
Subject: Merge branch 'api'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3d1fb545dd1f49e0624d3adf20e5568b1c33d8ec?ds=sidebyside

Merge branch 'api'
---

3d1fb545dd1f49e0624d3adf20e5568b1c33d8ec
diff --cc apps/catalogue/models.py
index cda5ba532,c1290fbcf..fd5dc987a
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@@ -17,13 -19,12 +19,14 @@@ from django.conf import setting
  
  from newtagging.models import TagBase, tags_updated
  from newtagging import managers
 -from catalogue.fields import JSONField
 +from catalogue.fields import JSONField, OverwritingFileField
 +from catalogue.utils import ExistingFile
  
  from librarian import dcparser, html, epub, NoDublinCore
 +import mutagen
  from mutagen import id3
  from slughifi import slughifi
+ from sortify import sortify
  
  
  TAG_CATEGORIES = (
@@@ -66,9 -67,9 +69,12 @@@ class Tag(TagBase)
      gazeta_link = models.CharField(blank=True, max_length=240)
      wiki_link = models.CharField(blank=True, max_length=240)
  
+     created_at    = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
+     changed_at    = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
+ 
 +    class UrlDeprecationWarning(DeprecationWarning):
 +        pass
 +
      categories_rev = {
          'autor': 'author',
          'epoka': 'epoch',