Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

4 files changed, 35 insertions, 1 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 88d6cdcfa..4e0273e77 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -183,7 +183,8 @@ class FileFormPreventive(forms.Form):
         super(FileFormPreventive, self).__init__(*args, **kwargs)
         self.fields['saisine_type'].choices = models.SaisineType.get_types()
         self.fields['saisine_type'].help_text = models.SaisineType.get_help()
-        self.fields['permit_type'].choices = models.PermitType.get_types()
+        self.fields['permit_type'].choices = models.PermitType.get_types(
+                                                              default='NP')
         self.fields['permit_type'].help_text = models.PermitType.get_help()
 
 class FinalFileClosingForm(FinalForm):
diff --git a/archaeological_files/management/__init__.py b/archaeological_files/management/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/archaeological_files/management/__init__.py
diff --git a/archaeological_files/management/commands/__init__.py b/archaeological_files/management/commands/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/archaeological_files/management/commands/__init__.py
diff --git a/archaeological_files/management/commands/fix_permittype.py b/archaeological_files/management/commands/fix_permittype.py
new file mode 100644
index 000000000..909952634
--- /dev/null
+++ b/archaeological_files/management/commands/fix_permittype.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import csv
+import datetime, time
+
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+
+from archaeological_files.models import File, PermitType
+
+replaced = (('cu', 'CU'),
+            ('pc', 'PC'),
+            ('ei', 'EI'),
+            ('', 'NP')
+            )
+
+
+class Command(BaseCommand):
+    help = "Update file types"
+
+    def handle(self, *args, **options):
+        self.stdout.write("* Update file types\n")
+        for origin, dest in replaced:
+            permit_type = PermitType.objects.get(txt_idx=dest)
+            if origin:
+                File.objects.filter(permit_type__txt_idx=origin).update(
+                                            permit_type=permit_type)
+                PermitType.objects.filter(txt_idx=origin).update(available=False)
+            else:
+                File.objects.filter(permit_type__isnull=True).update(
+                                            permit_type=permit_type)
+