From 40d3bafda5dd78cd49fecdb791ceb0bc92f860fb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 26 Jul 2017 14:57:50 +0200 Subject: v0.99.26 --- CHANGES.md | 11 +++++++++++ version.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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/version.py b/version.py index e06be2011..bce04060e 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 25) +VERSION = (0, 99, 26) def get_version(): -- cgit v1.2.3 From 702337c1e0b1e8db1cc98a5d757419a269b95601 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 27 Jul 2017 11:57:33 +0200 Subject: Fix ParcelField compress method --- archaeological_operations/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 058e637f4..3c974991f 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -61,7 +61,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) -- cgit v1.2.3 From a9ed79cbbb91aabe653c196b43e753fd2dbef439 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 27 Jul 2017 12:12:30 +0200 Subject: Year limit is now 1000 --- archaeological_files/forms.py | 2 +- archaeological_files_pdl/forms.py | 4 ++-- archaeological_finds/forms_treatments.py | 4 ++-- archaeological_operations/forms.py | 4 ++-- archaeological_operations/utils.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) 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 83fb11028..55e223b5d 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -95,7 +95,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=[], @@ -450,7 +450,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 3c974991f..e3e287d24 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -72,7 +72,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..8afbb3be8 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 -- cgit v1.2.3 From 16922547bb19e04a100d10c90f0ec48f02669835 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 30 Jul 2017 23:13:28 +0200 Subject: Data importer: allow many split for UnicodeFormater --- archaeological_operations/utils.py | 2 +- ishtar_common/data_importer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index 8afbb3be8..3a5057cd5 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -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 3bb65fc21..2ab5ba28f 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: -- cgit v1.2.3