diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-11-13 17:18:53 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-11-14 16:19:08 +0100 |
| commit | 872bc0f6b00c44a5978a826c063a3f1e50dd4b15 (patch) | |
| tree | dacf706f5422ac575edfed06f84400e5b4435ea3 /archaeological_finds | |
| parent | 4a21e99df5cffd472acfe26013a350c302429d74 (diff) | |
| download | Ishtar-872bc0f6b00c44a5978a826c063a3f1e50dd4b15.tar.bz2 Ishtar-872bc0f6b00c44a5978a826c063a3f1e50dd4b15.zip | |
✨ datings refactoring: add view/form
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 9 | ||||
| -rw-r--r-- | archaeological_finds/urls.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 34c442542..6b557bc55 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -29,6 +29,7 @@ {% with can_view_container=permission_view_own_container|or_:permission_view_container %} {% with display_warehouse_treatments=item.container|or_:item.container_ref|or_:item.upstream_treatment|or_:item.downstream_treatment|or_:non_modif_treatments_count|or_:associated_treatment_files_count %} {% with can_view_documents=permission_view_own_document|or_:permission_view_document %} +{% with can_change=permission_change_own_find|or_:permission_change_find %} {% with has_documents=item|safe_or:"documents.count|documents_list"|safe_and_not:"documents_not_available" %} {% with display_documents=can_view_documents|and_:has_documents %} {% with has_image=item.images_number %} @@ -252,7 +253,7 @@ {% endif %} {% with dating_list=item|m2m_listing:"datings" %} - {% if dating_list or item.dating_comment or item.cultural_attributions_count or item.periods_count %} + {% if can_change or dating_list or item.dating_comment or item.cultural_attributions_count or item.periods_count %} <h3>{% trans "Periods / Datings" %}</h3> {% if item.cultural_attributions_count or item.periods_count %} <div class='row'> @@ -260,8 +261,10 @@ {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} </div> {% endif %} - {% if dating_list %} + {% if can_change or dating_list %} + {% with url_dating="find-dating" %} {% include "ishtar/blocks/sheet_dating_list.html" %} + {% endwith %} {% endif %} <div class='row'> {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %} @@ -321,7 +324,7 @@ {% endif %} </div> -{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %} +{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %} {% endwith %} {% endblock %} diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index a690b8698..f36157c75 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -75,6 +75,14 @@ urlpatterns = [ )(views.QAFindDuplicateFormView.as_view()), name="find-qa-duplicate", ), + re_path( + r"^find-dating/(?P<pk>.+)/$", + check_permissions(["archaeological_finds.change_find", + "archaeological_finds.change_own_find"])( + views.find_dating_add + ), + name="find-dating-add", + ), re_path(r"get-findbasket/$", views.get_find_basket, name="get-findbasket"), re_path( r"get-findbasket-write/$", diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 6b612af43..0e9d46c16 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -61,6 +61,7 @@ from ishtar_common.views_item import ( get_autocomplete_queries, get_autocomplete_query ) +from archaeological_context_records.views import get_dating_form from archaeological_operations.wizards import AdministrativeActDeletionWizard from archaeological_finds import wizards @@ -1426,6 +1427,9 @@ class QAFindLockView(QABaseLockView): base_url = "find-qa-lock" +find_dating_add = get_dating_form(models.Find, models.FindDating, "find-dating-add") + + def get_geo_items(request, current_right=None): operation_pk = request.GET.get("operation_id") context_record_pk = request.GET.get("context_record_id") |
