celery supervisord conf

[wolnelektury.git] / apps / catalogue / migrations / 0001_initial.py

diff --git a/apps/catalogue/migrations/0001_initial.py b/apps/catalogue/migrations/0001_initial.py
index 2aabb82..045b2f2 100644 (file)
--- a/apps/catalogue/migrations/0001_initial.py
+++ b/apps/catalogue/migrations/0001_initial.py
@@ -7,27 +7,31 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
 class Migration(SchemaMigration):
 
     def forwards(self, orm):

-
+        

         # Adding model 'Tag'
         db.create_table('catalogue_tag', (
         # Adding model 'Tag'
         db.create_table('catalogue_tag', (

+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=120, db_index=True)),
+            ('sort_key', self.gf('django.db.models.fields.SlugField')(max_length=120, db_index=True)),

             ('category', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
             ('category', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),

-            ('gazeta_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),

             ('description', self.gf('django.db.models.fields.TextField')(blank=True)),
             ('description', self.gf('django.db.models.fields.TextField')(blank=True)),

-            ('main_page', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True, blank=True)),
-            ('sort_key', self.gf('django.db.models.fields.SlugField')(max_length=120, db_index=True)),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('wiki_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),
+            ('main_page', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),

             ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)),
             ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)),

-            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=120, db_index=True)),
-            ('book_count', self.gf('django.db.models.fields.IntegerField')(default=0)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
+            ('book_count', self.gf('django.db.models.fields.IntegerField')(null=True)),
+            ('death', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
+            ('gazeta_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),
+            ('wiki_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),

         ))
         db.send_create_signal('catalogue', ['Tag'])
 
         ))
         db.send_create_signal('catalogue', ['Tag'])
 

+        # Adding unique constraint on 'Tag', fields ['slug', 'category']
+        db.create_unique('catalogue_tag', ['slug', 'category'])
+

         # Adding model 'TagRelation'
         db.create_table('catalogue_tag_relation', (
         # Adding model 'TagRelation'
         db.create_table('catalogue_tag_relation', (

-            ('tag', self.gf('django.db.models.fields.related.ForeignKey')(related_name='items', to=orm['catalogue.Tag'])),

             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),

+            ('tag', self.gf('django.db.models.fields.related.ForeignKey')(related_name='items', to=orm['catalogue.Tag'])),

             ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
             ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
         ))
             ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])),
             ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
         ))


@@ -38,40 +42,87 @@ class Migration(SchemaMigration):
 
         # Adding model 'Book'
         db.create_table('catalogue_book', (
 
         # Adding model 'Book'
         db.create_table('catalogue_book', (

-            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, to=orm['catalogue.Book'])),
-            ('mp3_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
-            ('xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
-            ('description', self.gf('django.db.models.fields.TextField')(blank=True)),
-            ('wiki_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),

             ('title', self.gf('django.db.models.fields.CharField')(max_length=120)),
             ('title', self.gf('django.db.models.fields.CharField')(max_length=120)),

-            ('txt_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=120, db_index=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(blank=True)),

             ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
             ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),

-            ('pdf_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('html_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),

             ('_short_html', self.gf('django.db.models.fields.TextField')()),
             ('_short_html', self.gf('django.db.models.fields.TextField')()),

+            ('_short_html_de', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_en', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_es', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_fr', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_lt', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_pl', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_ru', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_uk', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),

             ('parent_number', self.gf('django.db.models.fields.IntegerField')(default=0)),
             ('parent_number', self.gf('django.db.models.fields.IntegerField')(default=0)),

-            ('ogg_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
-            ('odt_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
-            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=120, db_index=True)),
-            ('gazeta_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),

             ('extra_info', self.gf('catalogue.fields.JSONField')()),
             ('extra_info', self.gf('catalogue.fields.JSONField')()),

+            ('gazeta_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),
+            ('wiki_link', self.gf('django.db.models.fields.CharField')(max_length=240, blank=True)),
+            ('xml_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('html_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('pdf_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('epub_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('odt_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('txt_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('mp3_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('ogg_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='children', null=True, to=orm['catalogue.Book'])),
+            ('_tag_counter', self.gf('catalogue.fields.JSONField')(null=True)),
+            ('_theme_counter', self.gf('catalogue.fields.JSONField')(null=True)),

         ))
         db.send_create_signal('catalogue', ['Book'])
 
         # Adding model 'Fragment'
         db.create_table('catalogue_fragment', (
         ))
         db.send_create_signal('catalogue', ['Book'])
 
         # Adding model 'Fragment'
         db.create_table('catalogue_fragment', (

+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),

             ('text', self.gf('django.db.models.fields.TextField')()),
             ('text', self.gf('django.db.models.fields.TextField')()),

-            ('anchor', self.gf('django.db.models.fields.CharField')(max_length=120)),
+            ('short_text', self.gf('django.db.models.fields.TextField')()),

             ('_short_html', self.gf('django.db.models.fields.TextField')()),
             ('_short_html', self.gf('django.db.models.fields.TextField')()),

+            ('_short_html_de', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_en', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_es', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_fr', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_lt', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_pl', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_ru', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('_short_html_uk', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('anchor', self.gf('django.db.models.fields.CharField')(max_length=120)),

             ('book', self.gf('django.db.models.fields.related.ForeignKey')(related_name='fragments', to=orm['catalogue.Book'])),
             ('book', self.gf('django.db.models.fields.related.ForeignKey')(related_name='fragments', to=orm['catalogue.Book'])),

-            ('short_text', self.gf('django.db.models.fields.TextField')()),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),

         ))
         db.send_create_signal('catalogue', ['Fragment'])
 
         ))
         db.send_create_signal('catalogue', ['Fragment'])
 

+        # Adding model 'BookStub'
+        db.create_table('catalogue_bookstub', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=120)),
+            ('author', self.gf('django.db.models.fields.CharField')(max_length=120)),
+            ('pd', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=120, db_index=True)),
+            ('translator', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('translator_death', self.gf('django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal('catalogue', ['BookStub'])
+
+        # Adding model 'FileRecord'
+        db.create_table('catalogue_filerecord', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=120, db_index=True)),
+            ('type', self.gf('django.db.models.fields.CharField')(max_length=20, db_index=True)),
+            ('sha1', self.gf('django.db.models.fields.CharField')(max_length=40)),
+            ('time', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('catalogue', ['FileRecord'])
+

 
     def backwards(self, orm):
 
     def backwards(self, orm):

+        
+        # Removing unique constraint on 'TagRelation', fields ['tag', 'content_type', 'object_id']
+        db.delete_unique('catalogue_tag_relation', ['tag_id', 'content_type_id', 'object_id'])
+
+        # Removing unique constraint on 'Tag', fields ['slug', 'category']
+        db.delete_unique('catalogue_tag', ['slug', 'category'])

 
         # Deleting model 'Tag'
         db.delete_table('catalogue_tag')
 
         # Deleting model 'Tag'
         db.delete_table('catalogue_tag')


@@ -79,25 +130,28 @@ class Migration(SchemaMigration):
         # Deleting model 'TagRelation'
         db.delete_table('catalogue_tag_relation')
 
         # Deleting model 'TagRelation'
         db.delete_table('catalogue_tag_relation')
 

-        # Removing unique constraint on 'TagRelation', fields ['tag', 'content_type', 'object_id']
-        db.delete_unique('catalogue_tag_relation', ['tag_id', 'content_type_id', 'object_id'])
-

         # Deleting model 'Book'
         db.delete_table('catalogue_book')
 
         # Deleting model 'Fragment'
         db.delete_table('catalogue_fragment')
 
         # Deleting model 'Book'
         db.delete_table('catalogue_book')
 
         # Deleting model 'Fragment'
         db.delete_table('catalogue_fragment')
 

+        # Deleting model 'BookStub'
+        db.delete_table('catalogue_bookstub')
+
+        # Deleting model 'FileRecord'
+        db.delete_table('catalogue_filerecord')
+

 
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
 
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),

-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})

         },
         'auth.permission': {
         },
         'auth.permission': {

-            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},

             'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


@@ -108,22 +162,33 @@ class Migration(SchemaMigration):
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),

-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),

             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),

             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),

-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),

             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         },
         'catalogue.book': {
             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         },
         'catalogue.book': {

-            'Meta': {'object_name': 'Book'},
+            'Meta': {'ordering': "('title',)", 'object_name': 'Book'},

             '_short_html': ('django.db.models.fields.TextField', [], {}),
             '_short_html': ('django.db.models.fields.TextField', [], {}),

+            '_short_html_de': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_en': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_es': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_fr': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_lt': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_pl': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_ru': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_uk': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_tag_counter': ('catalogue.fields.JSONField', [], {'null': 'True'}),
+            '_theme_counter': ('catalogue.fields.JSONField', [], {'null': 'True'}),

             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),

+            'epub_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),

             'extra_info': ('catalogue.fields.JSONField', [], {}),
             'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}),
             'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),
             'extra_info': ('catalogue.fields.JSONField', [], {}),
             'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}),
             'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}),


@@ -140,9 +205,35 @@ class Migration(SchemaMigration):
             'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}),
             'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'})
         },
             'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}),
             'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'})
         },

+        'catalogue.bookstub': {
+            'Meta': {'ordering': "('title',)", 'object_name': 'BookStub'},
+            'author': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pd': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'translator': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'translator_death': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        'catalogue.filerecord': {
+            'Meta': {'ordering': "('-time', '-slug', '-type')", 'object_name': 'FileRecord'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sha1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'db_index': 'True'})
+        },

         'catalogue.fragment': {
         'catalogue.fragment': {

-            'Meta': {'object_name': 'Fragment'},
+            'Meta': {'ordering': "('book', 'anchor')", 'object_name': 'Fragment'},

             '_short_html': ('django.db.models.fields.TextField', [], {}),
             '_short_html': ('django.db.models.fields.TextField', [], {}),

+            '_short_html_de': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_en': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_es': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_fr': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_lt': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_pl': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_ru': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),
+            '_short_html_uk': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}),

             'anchor': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
             'book': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'fragments'", 'to': "orm['catalogue.Book']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'anchor': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
             'book': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'fragments'", 'to': "orm['catalogue.Book']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),


@@ -150,15 +241,16 @@ class Migration(SchemaMigration):
             'text': ('django.db.models.fields.TextField', [], {})
         },
         'catalogue.tag': {
             'text': ('django.db.models.fields.TextField', [], {})
         },
         'catalogue.tag': {

-            'Meta': {'object_name': 'Tag'},
-            'book_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'Meta': {'ordering': "('sort_key',)", 'unique_together': "(('slug', 'category'),)", 'object_name': 'Tag'},
+            'book_count': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),

             'category': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
             'category': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),

+            'death': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),

             'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

-            'main_page': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'main_page': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),

             'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),

-            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120', 'db_index': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}),

             'sort_key': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
             'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'})
             'sort_key': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
             'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'})


@@ -171,7 +263,7 @@ class Migration(SchemaMigration):
             'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'items'", 'to': "orm['catalogue.Tag']"})
         },
         'contenttypes.contenttype': {
             'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'items'", 'to': "orm['catalogue.Tag']"})
         },
         'contenttypes.contenttype': {

-            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

             'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),