From eadfe5d34a7d800abd3afddac2b579120f03effd Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 13 Oct 2014 23:54:55 +0200
Subject: [PATCH] update migrations

---
 example/sandbox/settings.py                   | 11 -----------
 ...add_mediatype__add_field_mediaitem_url.py} | 19 +++++++++----------
 2 files changed, 9 insertions(+), 21 deletions(-)
 rename telemeta/migrations/{0034_auto__add_copytype__add_mediatype__add_status__add_field_mediaitem_url.py => 0034_auto__add_copytype__add_status__add_mediatype__add_field_mediaitem_url.py} (99%)

diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py
index 4b55a270..46899e58 100644
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@ -182,17 +182,6 @@ BOOTSTRAP3 = {
     'javascript_in_head': True,
 }
 
-SESSION_EXPIRE_AT_BROWSER_CLOSE = False
-
-# Settings for django-bootstrap3
-
-BOOTSTRAP3 = {
-    'set_required': False,
-    'error_css_class': 'bootstrap3-error',
-    'required_css_class': 'bootstrap3-required',
-    'javascript_in_head': True,
-}
-
 PAGINATION_SETTINGS = {
     'PAGE_RANGE_DISPLAYED': 10,
     'MARGIN_PAGES_DISPLAYED': 2,
diff --git a/telemeta/migrations/0034_auto__add_copytype__add_mediatype__add_status__add_field_mediaitem_url.py b/telemeta/migrations/0034_auto__add_copytype__add_status__add_mediatype__add_field_mediaitem_url.py
similarity index 99%
rename from telemeta/migrations/0034_auto__add_copytype__add_mediatype__add_status__add_field_mediaitem_url.py
rename to telemeta/migrations/0034_auto__add_copytype__add_status__add_mediatype__add_field_mediaitem_url.py
index 4eb32314..be18ada1 100644
--- a/telemeta/migrations/0034_auto__add_copytype__add_mediatype__add_status__add_field_mediaitem_url.py
+++ b/telemeta/migrations/0034_auto__add_copytype__add_status__add_mediatype__add_field_mediaitem_url.py
@@ -15,19 +15,19 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('telemeta', ['CopyType'])
 
-        # Adding model 'MediaType'
-        db.create_table('media_type', (
+        # Adding model 'Status'
+        db.create_table('media_status', (
             (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('value', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)),
         ))
-        db.send_create_signal('telemeta', ['MediaType'])
+        db.send_create_signal('telemeta', ['Status'])
 
-        # Adding model 'Status'
-        db.create_table('media_status', (
+        # Adding model 'MediaType'
+        db.create_table('media_type', (
             (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('value', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)),
         ))
-        db.send_create_signal('telemeta', ['Status'])
+        db.send_create_signal('telemeta', ['MediaType'])
 
         # Adding field 'MediaItem.url'
         db.add_column('media_items', 'url',
@@ -84,17 +84,16 @@ class Migration(SchemaMigration):
                 if trig:
                     collection.save()
 
-
     def backwards(self, orm):
         # Deleting model 'CopyType'
         db.delete_table('copy_type')
 
-        # Deleting model 'MediaType'
-        db.delete_table('media_type')
-
         # Deleting model 'Status'
         db.delete_table('media_status')
 
+        # Deleting model 'MediaType'
+        db.delete_table('media_type')
+
         # Deleting field 'MediaItem.url'
         db.delete_column('media_items', 'url')
 
-- 
2.39.5