diff options
| -rw-r--r-- | CHANGES.md | 11 | ||||
| -rw-r--r-- | archaeological_files/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_files_pdl/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_operations/utils.py | 4 | ||||
| -rw-r--r-- | ishtar_common/data_importer.py | 3 | ||||
| -rw-r--r-- | version.py | 4 |
8 files changed, 25 insertions, 13 deletions
diff --git a/CHANGES.md b/CHANGES.md index 198be8ce3..16124023a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,17 @@ Ishtar changelog ================ +v0.99.26 (2017-07-26) +--------------------- +### Features ### +- Import: add FieldDoesNotExist to possible error on imports +- Add reference documents +- Update fixtures + +### Bug fixes ### +- Datings: post-fix of duplicates associated to the same object (usually on imports) +- Tests: fix fixtures management + v0.99.25 (2017-07-20) --------------------- ### Features ### diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index d8738f511..afb62ae4f 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -209,7 +209,7 @@ class FileFormGeneral(ManageOldType, forms.Form): validators=[valid_id(Person)]) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) numeric_reference = forms.IntegerField( label=_("Numeric reference"), widget=forms.HiddenInput, required=False) diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 73f1d789c..e5fbb4a96 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -40,7 +40,7 @@ class FileFormGeneral(ManageOldType, forms.Form): file_type = forms.ChoiceField(label=_("File type"), choices=[]) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) creation_date = forms.DateField(label=_(u"Creation date"), initial=get_now, widget=widgets.JQueryDate) @@ -413,7 +413,7 @@ class FileFormInstruction(forms.Form): instruction_deadline = forms.DateField(widget=widgets.JQueryDate, required=False) year = forms.IntegerField(label=_("Year"), - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) numeric_reference = forms.IntegerField(label=_("Numeric reference"), required=False) diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 446d67fc1..99813ea31 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -94,7 +94,7 @@ class BaseTreatmentForm(ManageOldType, forms.Form): label=_(u"Other ref."), max_length=200, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) treatment_type = forms.MultipleChoiceField( label=_(u"Treatment type"), choices=[], @@ -457,7 +457,7 @@ class TreatmentFileForm(ManageOldType, forms.Form): max_length=1000, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) internal_reference = forms.CharField( label=_(u"Internal ref."), max_length=60, required=False) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 4a7d56024..24b0a70be 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -62,7 +62,7 @@ class ParcelField(forms.MultiValueField): self.widget = ParcelWidget() return super(ParcelField, self).__init__(*args, **kwargs) - def compress(data_list): + def compress(self, data_list): return u"-".join(data_list) @@ -73,7 +73,7 @@ class ParcelForm(forms.Form): town = forms.ChoiceField(label=_("Town"), choices=(), required=False, validators=[valid_id(models.Town)]) year = forms.IntegerField(label=_("Year"), required=False, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) section = forms.CharField(label=_(u"Section"), required=False, validators=[validators.MaxLengthValidator(4)]) @@ -784,7 +784,7 @@ class OperationFormGeneral(ManageOldType, forms.Form): choices=[]) year = forms.IntegerField(label=_(u"Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1600), + validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) old_code = forms.CharField( label=_(u"Old code"), required=False, diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index 40ca71c05..3a5057cd5 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -256,7 +256,7 @@ def parse_year(value): yr = int(value) except ValueError: return None - if yr < 1600 or yr > 2100: + if yr < 1000 or yr > 2100: return None return yr @@ -268,7 +268,7 @@ def parse_trunc_patriarche(value): value = value.replace(' ', '') try: int(value) - except: + except ValueError: return return '18' + unicode(value) diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 4ac90f074..ea916a30f 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -156,7 +156,7 @@ class ChoiceChecker(object): class UnicodeFormater(Formater): def __init__(self, max_length=None, clean=False, re_filter=None, notnull=False, prefix=u'', db_target=None, - import_instance=None): + import_instance=None, many_split=None): self.max_length = max_length self.db_target = db_target self.clean = clean @@ -164,6 +164,7 @@ class UnicodeFormater(Formater): self.notnull = notnull self.prefix = prefix self.import_instance = import_instance + self.many_split = many_split def format(self, value): try: diff --git a/version.py b/version.py index 8b516aa40..22d9f4932 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ -# 1.99.5 -VERSION = (1, 99, 5) +# 1.99.6 +VERSION = (1, 99, 6) def get_version(): |