Merge branch 'develop' into develop-bootstrap

4 files changed, 17 insertions, 7 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 189a02c05..fa71c4d3f 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -46,6 +46,7 @@ from ishtar_common.utils import get_cache
 
 from ishtar_common import forms as common_forms
 from archaeological_files import forms as file_forms
+from archaeological_files_pdl import forms as file_pdl_forms
 from archaeological_operations import forms as operation_forms
 from archaeological_context_records import forms as context_record_forms
 from archaeological_finds import forms as find_forms, \
@@ -53,7 +54,7 @@ from archaeological_finds import forms as find_forms, \
 from archaeological_warehouse import forms as warehouse_forms
 
 
-ISHTAR_FORMS = [common_forms, file_forms, operation_forms,
+ISHTAR_FORMS = [common_forms, file_pdl_forms, file_forms, operation_forms,
                 context_record_forms, find_forms, treatment_forms,
                 warehouse_forms]
 
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 97c0856a2..f0949b126 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -1641,7 +1641,7 @@
             "ishtar-operations"
         ],
         "col_number": 24,
-        "description": "Date de cl\u00f4ture (peut \u00eatre la date de rendu de la documentation, la fin de la recherche associ\u00e9e ou autre). Habituellement cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.",
+        "description": "Date de cl\u00f4ture (peut \u00eatre la date de versement de la documentation, la fin de la recherche associ\u00e9e ou autre). Habituellement cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.",
         "regexp_pre_filter": null,
         "required": false,
         "export_field_name": null
@@ -1720,12 +1720,12 @@
 {
     "model": "ishtar_common.importercolumn",
     "fields": {
-        "label": "Date limite pour le rendu de la documentation",
+        "label": "Date limite pour le versement de la documentation",
         "importer_type": [
             "ishtar-operations"
         ],
         "col_number": 30,
-        "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique.",
+        "description": "Date limite pr\u00e9vue pour le versement de la documentation scientifique.",
         "regexp_pre_filter": null,
         "required": false,
         "export_field_name": null
@@ -1748,12 +1748,12 @@
 {
     "model": "ishtar_common.importercolumn",
     "fields": {
-        "label": "Date limite rendu du mobilier",
+        "label": "Date limite versement du mobilier",
         "importer_type": [
             "ishtar-operations"
         ],
         "col_number": 32,
-        "description": "Date limite pr\u00e9vue pour le rendu du mobilier.",
+        "description": "Date limite pr\u00e9vue pour le versement du mobilier.",
         "regexp_pre_filter": null,
         "required": false,
         "export_field_name": null
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index c93065fac..4edb22c18 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -731,6 +731,7 @@ class TownFormSet(FormSet):
         return self.check_duplicate(('town',),
                                     _("There are identical towns."))
 
+
 TownFormset = formset_factory(TownForm, can_delete=True, formset=TownFormSet)
 TownFormset.form_label = _("Towns")
 TownFormset.form_admin_name = _(u"Towns")
@@ -864,6 +865,9 @@ class MergeOrganizationForm(MergeForm):
 ######################
 class SourceForm(CustomForm, ManageOldType, forms.Form):
     form_label = _(u"Documentation informations")
+    form_admin_name = _("Source - General")
+    form_slug = "source-general"
+
     file_upload = True
     associated_models = {'source_type': models.SourceType}
     title = forms.CharField(label=_(u"Title"),
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index b0751f661..4db445c41 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -23,6 +23,7 @@ Models description
 from cStringIO import StringIO
 import copy
 import datetime
+import inspect
 from PIL import Image
 import logging
 import os
@@ -1651,6 +1652,9 @@ class CustomForm(models.Model):
         verbose_name_plural = _(u"Custom forms")
         ordering = ['name', 'form']
 
+    def __unicode__(self):
+        return u"{} - {}".format(self.name, self.form)
+
     def users_lbl(self):
         users = [unicode(user) for user in self.users.all()]
         return " ; ".join(users)
@@ -1683,7 +1687,8 @@ class CustomForm(models.Model):
                     # not very clean... but do not treat inappropriate items
                     continue
                 form = getattr(app_form, form)
-                if not issubclass(form, CustomForm) \
+                if not inspect.isclass(form) \
+                        or not issubclass(form, CustomForm) \
                         or not getattr(form, 'form_slug', None):
                     continue
                 cls._register[form.form_slug] = form