diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 13:05:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-16 13:05:23 +0200 |
| commit | 6d229540ac8fdc5e5da95de214927a0f654cf55e (patch) | |
| tree | b4c06eec6837a5fd041dd9aabb2c71f3197079d8 | |
| parent | 6bb7d4cbf47c61fd168998a0423a31814eaa7fe0 (diff) | |
| download | Ishtar-6d229540ac8fdc5e5da95de214927a0f654cf55e.tar.bz2 Ishtar-6d229540ac8fdc5e5da95de214927a0f654cf55e.zip | |
Fix migration after merge
| -rw-r--r-- | archaeological_finds/migrations/0048_auto__add_field_treatmenttype_upstream_is_many__add_field_treatmenttyp.py (renamed from archaeological_finds/migrations/0047_auto__add_field_treatmenttype_upstream_is_many__add_field_treatmenttyp.py) | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/archaeological_finds/migrations/0047_auto__add_field_treatmenttype_upstream_is_many__add_field_treatmenttyp.py b/archaeological_finds/migrations/0048_auto__add_field_treatmenttype_upstream_is_many__add_field_treatmenttyp.py index 41dc260c5..27c628852 100644 --- a/archaeological_finds/migrations/0047_auto__add_field_treatmenttype_upstream_is_many__add_field_treatmenttyp.py +++ b/archaeological_finds/migrations/0048_auto__add_field_treatmenttype_upstream_is_many__add_field_treatmenttyp.py @@ -98,7 +98,7 @@ class Migration(SchemaMigration): 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) }, 'archaeological_context_records.identificationtype': { - 'Meta': {'ordering': "('order',)", 'object_name': 'IdentificationType'}, + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'IdentificationType'}, 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -245,12 +245,14 @@ class Migration(SchemaMigration): 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'conservatory_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'blank': 'True'}), 'container': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'to': "orm['archaeological_warehouse.Container']"}), 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_context_records.Dating']"}), 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'downstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'upstream'", 'null': 'True', 'to': "orm['archaeological_finds.Treatment']"}), 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), @@ -341,11 +343,13 @@ class Migration(SchemaMigration): 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'conservatory_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'downstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), |