summaryrefslogtreecommitdiff
path: root/archaeological_files/migrations
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_files/migrations')
-rw-r--r--archaeological_files/migrations/0106_auto_20210729_1616.py (renamed from archaeological_files/migrations/0106_auto_20210726_1230.py)12
1 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_files/migrations/0106_auto_20210726_1230.py b/archaeological_files/migrations/0106_auto_20210729_1616.py
index 5f3163cf9..3891b5d30 100644
--- a/archaeological_files/migrations/0106_auto_20210726_1230.py
+++ b/archaeological_files/migrations/0106_auto_20210729_1616.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.28 on 2021-07-26 12:30
+# Generated by Django 1.11.28 on 2021-07-29 16:16
from __future__ import unicode_literals
import django.core.validators
@@ -79,16 +79,16 @@ class Migration(migrations.Migration):
('available', models.BooleanField(default=True, verbose_name='Available')),
('ground_daily_cost', models.FloatField(blank=True, null=True, verbose_name='Ground daily cost')),
('daily_cost', models.FloatField(blank=True, null=True, verbose_name='Daily cost')),
- ('permanent_contract', models.NullBooleanField(verbose_name='Is a permanent contract')),
- ('default_daily_need_on_ground', models.FloatField(default=0, verbose_name='Default daily number needed on the ground')),
- ('default_daily_need', models.FloatField(default=0, verbose_name='Default daily number needed')),
+ ('permanent_contract', models.NullBooleanField(verbose_name='Permanent contract')),
+ ('default_daily_need_on_ground', models.FloatField(default=0, verbose_name='Def. daily number on ground')),
+ ('default_daily_need', models.FloatField(default=0, verbose_name='Def. daily number')),
('order', models.IntegerField(default=10, verbose_name='Order')),
- ('parents', models.ManyToManyField(blank=True, help_text='Auto-add this job when a parent is added', related_name='_job_parents_+', to='archaeological_files.Job', verbose_name='Parents')),
+ ('child', models.ForeignKey(blank=True, help_text='Auto-add this job when a parent is added', null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_files.Job', verbose_name='Child')),
],
options={
'verbose_name': 'Job',
'verbose_name_plural': 'Jobs',
- 'ordering': ('order', 'label'),
+ 'ordering': ('order', '-permanent_contract', 'label'),
},
bases=(ishtar_common.models_common.Cached, models.Model),
),