From d3f7431f7d55957cb7b900f1f203783cdfacfc4d Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Tue, 12 Apr 2016 08:47:17 +1000 Subject: [PATCH] Squashes migrations from rename_to_flags branch; marks as normal migration --- .../migrations/0021_auto_20160411_0748.py | 31 -------- ...1_0748_squashed_0024_auto_20160411_2230.py | 77 +++++++++++++++++++ .../migrations/0022_auto_20160411_0806.py | 31 -------- ...1_1001_squashed_0024_auto_20160411_1002.py | 37 --------- .../migrations/0024_auto_20160411_2230.py | 25 ------ 5 files changed, 77 insertions(+), 124 deletions(-) delete mode 100644 registrasion/migrations/0021_auto_20160411_0748.py create mode 100644 registrasion/migrations/0021_auto_20160411_0748_squashed_0024_auto_20160411_2230.py delete mode 100644 registrasion/migrations/0022_auto_20160411_0806.py delete mode 100644 registrasion/migrations/0023_auto_20160411_1001_squashed_0024_auto_20160411_1002.py delete mode 100644 registrasion/migrations/0024_auto_20160411_2230.py diff --git a/registrasion/migrations/0021_auto_20160411_0748.py b/registrasion/migrations/0021_auto_20160411_0748.py deleted file mode 100644 index 345cd4ad..00000000 --- a/registrasion/migrations/0021_auto_20160411_0748.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-11 07:48 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('registrasion', '0020_auto_20160411_0258'), - ] - - operations = [ - migrations.RenameModel( - old_name='CategoryEnablingCondition', - new_name='CategoryFlag', - ), - migrations.RenameModel( - old_name='ProductEnablingCondition', - new_name='ProductFlag', - ), - migrations.RenameModel( - old_name='TimeOrStockLimitEnablingCondition', - new_name='TimeOrStockLimitFlag', - ), - migrations.RenameModel( - old_name='VoucherEnablingCondition', - new_name='VoucherFlag', - ), - ] diff --git a/registrasion/migrations/0021_auto_20160411_0748_squashed_0024_auto_20160411_2230.py b/registrasion/migrations/0021_auto_20160411_0748_squashed_0024_auto_20160411_2230.py new file mode 100644 index 00000000..53b82d10 --- /dev/null +++ b/registrasion/migrations/0021_auto_20160411_0748_squashed_0024_auto_20160411_2230.py @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-11 22:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('registrasion', '0020_auto_20160411_0258'), + ] + + operations = [ + migrations.RenameModel( + old_name='CategoryEnablingCondition', + new_name='CategoryFlag', + ), + migrations.RenameModel( + old_name='ProductEnablingCondition', + new_name='ProductFlag', + ), + migrations.RenameModel( + old_name='TimeOrStockLimitEnablingCondition', + new_name='TimeOrStockLimitFlag', + ), + migrations.RenameModel( + old_name='VoucherEnablingCondition', + new_name='VoucherFlag', + ), + migrations.AlterModelOptions( + name='categoryflag', + options={'verbose_name': 'flag (dependency on product from category)', 'verbose_name_plural': 'flags (dependency on product from category)'}, + ), + migrations.AlterModelOptions( + name='productflag', + options={'verbose_name': 'flag (dependency on product)', 'verbose_name_plural': 'flags (dependency on product)'}, + ), + migrations.AlterModelOptions( + name='timeorstocklimitflag', + options={'verbose_name': 'flag (time/stock limit)', 'verbose_name_plural': 'flags (time/stock limit)'}, + ), + migrations.AlterModelOptions( + name='voucherflag', + options={'verbose_name': 'flag (dependency on voucher)', 'verbose_name_plural': 'flags (dependency on voucher)'}, + ), + migrations.AlterField( + model_name='enablingconditionbase', + name='categories', + field=models.ManyToManyField(blank=True, help_text="Categories whose products are affected by this flag's condition.", to=b'registrasion.Category'), + ), + migrations.RenameField( + model_name='enablingconditionbase', + old_name='mandatory', + new_name='condition', + ), + migrations.AlterField( + model_name='enablingconditionbase', + name='condition', + field=models.IntegerField(choices=[(1, 'Disable if false'), (2, 'Enable if true')], default=2, help_text="If there is at least one 'disable if false' flag defined on a product or category, all such flag conditions must be met. If there is at least one 'enable if true' flag, at least one such condition must be met. If both types of conditions exist on a product, both of these rules apply."), + ), + migrations.AlterField( + model_name='enablingconditionbase', + name='products', + field=models.ManyToManyField(blank=True, help_text="Products affected by this flag's condition.", to=b'registrasion.Product'), + ), + migrations.AlterField( + model_name='enablingconditionbase', + name='categories', + field=models.ManyToManyField(blank=True, help_text="Categories whose products are affected by this flag's condition.", related_name='flagbase_set', to=b'registrasion.Category'), + ), + migrations.AlterField( + model_name='enablingconditionbase', + name='products', + field=models.ManyToManyField(blank=True, help_text="Products affected by this flag's condition.", related_name='flagbase_set', to=b'registrasion.Product'), + ), + ] diff --git a/registrasion/migrations/0022_auto_20160411_0806.py b/registrasion/migrations/0022_auto_20160411_0806.py deleted file mode 100644 index 436937ce..00000000 --- a/registrasion/migrations/0022_auto_20160411_0806.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-11 08:06 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('registrasion', '0021_auto_20160411_0748'), - ] - - operations = [ - migrations.AlterModelOptions( - name='categoryflag', - options={'verbose_name': 'flag (dependency on product from category)', 'verbose_name_plural': 'flags (dependency on product from category)'}, - ), - migrations.AlterModelOptions( - name='productflag', - options={'verbose_name': 'flag (dependency on product)', 'verbose_name_plural': 'flags (dependency on product)'}, - ), - migrations.AlterModelOptions( - name='timeorstocklimitflag', - options={'verbose_name': 'flag (time/stock limit)', 'verbose_name_plural': 'flags (time/stock limit)'}, - ), - migrations.AlterModelOptions( - name='voucherflag', - options={'verbose_name': 'flag (dependency on voucher)', 'verbose_name_plural': 'flags (dependency on voucher)'}, - ), - ] diff --git a/registrasion/migrations/0023_auto_20160411_1001_squashed_0024_auto_20160411_1002.py b/registrasion/migrations/0023_auto_20160411_1001_squashed_0024_auto_20160411_1002.py deleted file mode 100644 index e9a9f6bb..00000000 --- a/registrasion/migrations/0023_auto_20160411_1001_squashed_0024_auto_20160411_1002.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-11 10:46 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - replaces = [('registrasion', '0023_auto_20160411_1001'), ('registrasion', '0024_auto_20160411_1002')] - - dependencies = [ - ('registrasion', '0022_auto_20160411_0806'), - ] - - operations = [ - migrations.AlterField( - model_name='enablingconditionbase', - name='categories', - field=models.ManyToManyField(blank=True, help_text="Categories whose products are affected by this flag's condition.", to=b'registrasion.Category'), - ), - migrations.RenameField( - model_name='enablingconditionbase', - old_name='mandatory', - new_name='condition', - ), - migrations.AlterField( - model_name='enablingconditionbase', - name='condition', - field=models.IntegerField(choices=[(1, 'Disable if false'), (2, 'Enable if true')], default=2, help_text="If there is at least one 'disable if false' flag defined on a product or category, all such flag conditions must be met. If there is at least one 'enable if true' flag, at least one such condition must be met. If both types of conditions exist on a product, both of these rules apply."), - ), - migrations.AlterField( - model_name='enablingconditionbase', - name='products', - field=models.ManyToManyField(blank=True, help_text="Products affected by this flag's condition.", to=b'registrasion.Product'), - ), - ] diff --git a/registrasion/migrations/0024_auto_20160411_2230.py b/registrasion/migrations/0024_auto_20160411_2230.py deleted file mode 100644 index e1baf8c4..00000000 --- a/registrasion/migrations/0024_auto_20160411_2230.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-11 22:30 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('registrasion', '0023_auto_20160411_1001_squashed_0024_auto_20160411_1002'), - ] - - operations = [ - migrations.AlterField( - model_name='enablingconditionbase', - name='categories', - field=models.ManyToManyField(blank=True, help_text="Categories whose products are affected by this flag's condition.", related_name='flagbase_set', to='registrasion.Category'), - ), - migrations.AlterField( - model_name='enablingconditionbase', - name='products', - field=models.ManyToManyField(blank=True, help_text="Products affected by this flag's condition.", related_name='flagbase_set', to='registrasion.Product'), - ), - ]