diff options
| -rw-r--r-- | CHANGES.md | 12 | ||||
| -rw-r--r-- | Makefile.example | 3 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 1 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 1 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 |
6 files changed, 22 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index ae82b1d00..ba1d362e8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,18 @@ Ishtar changelog ================ +v3.1.8 - 2021-04-02 +------------------- + +### Features ### +- Statistics - modalities: + - Context record: operation + - Find: operation + - Container: container type + +### Bug fixes ### +- Forms: fix permissions evaluation on field options + v3.1.7 - 2021-03-30 ------------------- diff --git a/Makefile.example b/Makefile.example index 483e411c5..a340f93b0 100644 --- a/Makefile.example +++ b/Makefile.example @@ -78,7 +78,8 @@ test: clean ## launch tests cd $(project); $(PYTHON) manage.py test $(apps) soft_test: clean ## launch tests without database regeneration - cd $(project); $(PYTHON) manage.py test -k $(apps) + cd $(project); $(PYTHON) manage.py test -k --tag gis $(apps) + cd $(project); $(PYTHON) manage.py test -k --exclude-tag gis $(apps) soft_test_verbose: clean ## launch tests without database regeneration - verbose cd $(project); $(PYTHON) manage.py test -k --verbosity 2 $(apps) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 26353eed1..83c2d6b43 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -447,6 +447,7 @@ class ContextRecord( STATISTIC_MODALITIES_OPTIONS = OrderedDict( [ ("unit__label", _("Context record type")), + ("operation__cached_label", _("Operation")), ("datings__period__label", _("Period")), ("identification__label", _("Identification")), ("activity__label", _("Activity")), diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index cf521c2b6..0e4e89745 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1091,6 +1091,10 @@ class Find( "base_finds__context_record__operation__operation_type__label", _("Operation type"), ), + ( + "base_finds__context_record__operation__cached_label", + _("Operation"), + ), ("base_finds__context_record__operation__year", _("Year")), ("base_finds__context_record__operation__towns__areas__label", _("Area")), ( diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 5a852a367..6347104bc 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -786,6 +786,7 @@ class Container( "finds__base_finds__context_record__operation__cached_label", _("Operation"), ), + ("container_type__label", _("Container type")), ] ) STATISTIC_MODALITIES = [key for key, lbl in STATISTIC_MODALITIES_OPTIONS.items()] diff --git a/ishtar_common/version.py b/ishtar_common/version.py index 5a9b39191..312f35bfb 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 3.1.7 -VERSION = (3, 1, 7) +# 3.1.8 +VERSION = (3, 1, 8) def get_version(): |