From 136fc3b24f2ca5b1d2ce589336d425e3c1b86a8d Mon Sep 17 00:00:00 2001 From: PekopT Date: Wed, 3 Aug 2016 17:46:42 +0300 Subject: [PATCH] #WTF migrations fixes --- api/views.py | 14 ++++++++----- .../migrations/0009_auto_20160802_1226.py | 15 ++----------- .../migrations/0009_auto_20160802_1414.py | 1 + .../migrations/0011_auto_20160802_1653.py | 13 +++++++++++- users/forms.py | 21 +++++++++++++------ 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/api/views.py b/api/views.py index 69ed315..a2dd477 100755 --- a/api/views.py +++ b/api/views.py @@ -66,11 +66,13 @@ class RealtyViewSet(ModelViewSet): class SpecializationViewSet(ModelViewSet): - queryset = Specialization.objects.root_nodes()[0].get_descendants() - # queryset = Specialization.objects # Migrate with this enabled + try: # TODO: dirty + queryset = Specialization.objects.root_nodes()[0].get_descendants() + except: + queryset = Specialization.objects serializer_class = SpecializationSerializer filter_class = SpecializationFilterSet - + class UserViewSet(ModelViewSet): queryset = User.objects.all() @@ -79,7 +81,9 @@ class UserViewSet(ModelViewSet): class LocationViewSet(ModelViewSet): - queryset = Location.objects.root_nodes()[0].get_descendants() - # queryset = Location.objects # Migrate with this enabled + try: # TODO: dirty + queryset = Location.objects.root_nodes()[0].get_descendants() + except: + queryset = Location.objects serializer_class = LocationSerializer filter_class = LocationFilterSet diff --git a/projects/migrations/0009_auto_20160802_1226.py b/projects/migrations/0009_auto_20160802_1226.py index a327d92..bc2011b 100644 --- a/projects/migrations/0009_auto_20160802_1226.py +++ b/projects/migrations/0009_auto_20160802_1226.py @@ -2,9 +2,7 @@ # Generated by Django 1.9.7 on 2016-08-02 09:26 from __future__ import unicode_literals -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone +from django.db import migrations class Migration(migrations.Migration): @@ -15,14 +13,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AddField( - model_name='order', - name='team', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='team_orders', to='users.Team'), - ), - migrations.AlterField( - model_name='stage', - name='created', - field=models.DateTimeField(default=django.utils.timezone.now), - ), + ] diff --git a/projects/migrations/0009_auto_20160802_1414.py b/projects/migrations/0009_auto_20160802_1414.py index e5c8983..9ba4048 100644 --- a/projects/migrations/0009_auto_20160802_1414.py +++ b/projects/migrations/0009_auto_20160802_1414.py @@ -12,6 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('projects', '0008_merge'), + ('projects', '0009_auto_20160802_1226'), ] operations = [ diff --git a/projects/migrations/0011_auto_20160802_1653.py b/projects/migrations/0011_auto_20160802_1653.py index a2ea21e..7384d36 100644 --- a/projects/migrations/0011_auto_20160802_1653.py +++ b/projects/migrations/0011_auto_20160802_1653.py @@ -3,7 +3,8 @@ from __future__ import unicode_literals from django.db import migrations, models - +import django.db.models.deletion +import django.utils.timezone class Migration(migrations.Migration): @@ -22,4 +23,14 @@ class Migration(migrations.Migration): name='secure_deal_only', field=models.BooleanField(default=False), ), + migrations.AddField( + model_name='order', + name='team', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='team_orders', to='users.Team'), + ), + migrations.AlterField( + model_name='stage', + name='created', + field=models.DateTimeField(default=django.utils.timezone.now), + ), ] diff --git a/users/forms.py b/users/forms.py index c896b34..ffc6acf 100644 --- a/users/forms.py +++ b/users/forms.py @@ -126,16 +126,25 @@ class ContractorFilterForm(forms.Form): order_by = forms.ChoiceField(required=False, choices=CONTRACTOR_ORDER_CHOICES) last_order_by = forms.ChoiceField(required=False, choices=CONTRACTOR_ORDER_CHOICES) reverse_order = forms.BooleanField(required=False) - + + + try: #TODO: dirty + qs = Specialization.objects.root_nodes()[0].get_descendants() + except: + qs = Specialization.objects + specialization = forms.ModelChoiceField( - queryset=Specialization.objects.root_nodes()[0].get_descendants(), - # queryset=Specialization.objects, # Migrate with this enabled + queryset=qs, required=False, ) - + + try: # TODO: dirty + qs = Location.objects.root_nodes()[0].get_descendants() + except: + qs = Location.objects + location = forms.ModelChoiceField( - queryset=Location.objects.root_nodes()[0].get_descendants(), - # queryset=Location.objects, # Migrate with this enabled + queryset=qs, required=False, )