Refactoring of models. Document container - declare only id

3 files changed, 51 insertions, 34 deletions

diff --git a/ishtar_common/migrations/0201_squashed.py b/ishtar_common/migrations/0201_squashed.py
index d0710636e..d7b65626a 100644
--- a/ishtar_common/migrations/0201_squashed.py
+++ b/ishtar_common/migrations/0201_squashed.py
@@ -203,7 +203,11 @@ class Migration(migrations.Migration):
                 'ordering': ('title',),
                 'permissions': (('view_document', 'Peut voir tous les Documents'), ('view_own_document', 'Peut voir ses propres Documents'), ('add_own_document', 'Peut ajouter son propre Document'), ('change_own_document', 'Peut modifier ses propres Documents'), ('delete_own_document', 'Peut supprimer ses propres Documents')),
             },
-            bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, ishtar_common.models.OwnPerms, models.Model, ishtar_common.models.CachedGen, ishtar_common.models.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.ImageContainerModel, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem),
+            bases=(ishtar_common.models.StatisticItem,
+                   ishtar_common.models.TemplateItem,
+                   ishtar_common.models.OwnPerms, models.Model,
+                   ishtar_common.models.CachedGen,
+                   ishtar_common.models.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.ImageContainerModel, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem),
         ),
         migrations.CreateModel(
             name='DocumentTemplate',
diff --git a/ishtar_common/migrations/0204_auto_20200514_1124.py b/ishtar_common/migrations/0204_auto_20200514_1124.py
deleted file mode 100644
index 4eea40bf3..000000000
--- a/ishtar_common/migrations/0204_auto_20200514_1124.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-05-14 11:24
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_warehouse', '0103_auto_container_views'),
-        ('ishtar_common', '0203_auto_20200407_1142'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='document',
-            name='container',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contained_documents', to='archaeological_warehouse.Container', verbose_name='Container'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='container_ref',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contained_documents_ref', to='archaeological_warehouse.Container', verbose_name='Reference container'),
-        ),
-    ]
diff --git a/ishtar_common/migrations/0205_auto_20200527_1500.py b/ishtar_common/migrations/0204_auto_20201007_1630.py
index deed0ad90..9b5ab0876 100644
--- a/ishtar_common/migrations/0205_auto_20200527_1500.py
+++ b/ishtar_common/migrations/0204_auto_20201007_1630.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-05-27 15:00
+# Generated by Django 1.11.27 on 2020-10-07 16:30
 from __future__ import unicode_literals
 
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
-import ishtar_common.models
+import ishtar_common.models_common
 import re
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0204_auto_20200514_1124'),
+        ('ishtar_common', '0203_auto_20200407_1142'),
     ]
 
     operations = [
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'Document tags',
                 'ordering': ('label',),
             },
-            bases=(ishtar_common.models.Cached, models.Model),
+            bases=(ishtar_common.models_common.Cached, models.Model),
         ),
         migrations.CreateModel(
             name='Language',
@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Language',
                 'verbose_name_plural': 'Languages',
             },
-            bases=(ishtar_common.models.Cached, models.Model),
+            bases=(ishtar_common.models_common.Cached, models.Model),
         ),
         migrations.AlterModelOptions(
             name='sourcetype',
@@ -54,6 +54,16 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='document',
+            name='container_id',
+            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='Container ID'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='container_ref_id',
+            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='Container ID'),
+        ),
+        migrations.AddField(
+            model_name='document',
             name='isbn',
             field=models.CharField(blank=True, max_length=13, null=True, verbose_name='ISBN'),
         ),
@@ -65,7 +75,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='document',
             name='publisher',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.Organization', verbose_name='Publisher'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='publish', to='ishtar_common.Organization', verbose_name='Publisher'),
         ),
         migrations.AddField(
             model_name='document',
@@ -92,6 +102,36 @@ class Migration(migrations.Migration):
             name='is_localized',
             field=models.BooleanField(default=False, help_text='Setting a language for this type of document is relevant', verbose_name='Is localized'),
         ),
+        migrations.AlterField(
+            model_name='document',
+            name='format_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.Format', verbose_name='Medium'),
+        ),
+        migrations.AlterField(
+            model_name='importercolumn',
+            name='regexp_pre_filter',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.Regexp'),
+        ),
+        migrations.AlterField(
+            model_name='importercolumn',
+            name='value_format',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.ValueFormater'),
+        ),
+        migrations.AlterField(
+            model_name='importertype',
+            name='associated_models',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='importer_type_associated', to='ishtar_common.ImporterModel', verbose_name='Associated model'),
+        ),
+        migrations.AlterField(
+            model_name='importertype',
+            name='created_models',
+            field=models.ManyToManyField(blank=True, help_text='Leave blank for no restrictions', related_name='importer_type_created', to='ishtar_common.ImporterModel', verbose_name='Models that can accept new items'),
+        ),
+        migrations.AlterField(
+            model_name='importtarget',
+            name='formater_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='targets', to='ishtar_common.FormaterType'),
+        ),
         migrations.AddField(
             model_name='document',
             name='language',