#WTF migrations fixes

remotes/origin/setup
PekopT 10 years ago
parent c96413cae4
commit 136fc3b24f
  1. 14
      api/views.py
  2. 15
      projects/migrations/0009_auto_20160802_1226.py
  3. 1
      projects/migrations/0009_auto_20160802_1414.py
  4. 13
      projects/migrations/0011_auto_20160802_1653.py
  5. 21
      users/forms.py

@ -66,11 +66,13 @@ class RealtyViewSet(ModelViewSet):
class SpecializationViewSet(ModelViewSet): class SpecializationViewSet(ModelViewSet):
queryset = Specialization.objects.root_nodes()[0].get_descendants() try: # TODO: dirty
# queryset = Specialization.objects # Migrate with this enabled queryset = Specialization.objects.root_nodes()[0].get_descendants()
except:
queryset = Specialization.objects
serializer_class = SpecializationSerializer serializer_class = SpecializationSerializer
filter_class = SpecializationFilterSet filter_class = SpecializationFilterSet
class UserViewSet(ModelViewSet): class UserViewSet(ModelViewSet):
queryset = User.objects.all() queryset = User.objects.all()
@ -79,7 +81,9 @@ class UserViewSet(ModelViewSet):
class LocationViewSet(ModelViewSet): class LocationViewSet(ModelViewSet):
queryset = Location.objects.root_nodes()[0].get_descendants() try: # TODO: dirty
# queryset = Location.objects # Migrate with this enabled queryset = Location.objects.root_nodes()[0].get_descendants()
except:
queryset = Location.objects
serializer_class = LocationSerializer serializer_class = LocationSerializer
filter_class = LocationFilterSet filter_class = LocationFilterSet

@ -2,9 +2,7 @@
# Generated by Django 1.9.7 on 2016-08-02 09:26 # Generated by Django 1.9.7 on 2016-08-02 09:26
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -15,14 +13,5 @@ class Migration(migrations.Migration):
] ]
operations = [ 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),
),
] ]

@ -12,6 +12,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contenttypes', '0002_remove_content_type_name'), ('contenttypes', '0002_remove_content_type_name'),
('projects', '0008_merge'), ('projects', '0008_merge'),
('projects', '0009_auto_20160802_1226'),
] ]
operations = [ operations = [

@ -3,7 +3,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -22,4 +23,14 @@ class Migration(migrations.Migration):
name='secure_deal_only', name='secure_deal_only',
field=models.BooleanField(default=False), 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),
),
] ]

@ -126,16 +126,25 @@ class ContractorFilterForm(forms.Form):
order_by = forms.ChoiceField(required=False, choices=CONTRACTOR_ORDER_CHOICES) order_by = forms.ChoiceField(required=False, choices=CONTRACTOR_ORDER_CHOICES)
last_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) reverse_order = forms.BooleanField(required=False)
try: #TODO: dirty
qs = Specialization.objects.root_nodes()[0].get_descendants()
except:
qs = Specialization.objects
specialization = forms.ModelChoiceField( specialization = forms.ModelChoiceField(
queryset=Specialization.objects.root_nodes()[0].get_descendants(), queryset=qs,
# queryset=Specialization.objects, # Migrate with this enabled
required=False, required=False,
) )
try: # TODO: dirty
qs = Location.objects.root_nodes()[0].get_descendants()
except:
qs = Location.objects
location = forms.ModelChoiceField( location = forms.ModelChoiceField(
queryset=Location.objects.root_nodes()[0].get_descendants(), queryset=qs,
# queryset=Location.objects, # Migrate with this enabled
required=False, required=False,
) )

Loading…
Cancel
Save