diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index a8053214f..0b05ad37d 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -28,7 +28,6 @@ from django.utils.translation import ugettext_lazy as _ from ishtar_common.views import get_item, show_item, revert_item -from ishtar_common.models import Person from archaeological_operations.models import Operation import models @@ -77,28 +76,7 @@ def autocomplete_file(request): for file in files]) return HttpResponse(data, mimetype='text/plain') -get_file = get_item( - models.File, 'get_file', 'file', - bool_fields=['end_date__isnull'], - extra_request_keys={ - 'parcel_0': ('parcels__section', - 'operations__parcels__section'), - 'parcel_1': ('parcels__parcel_number', - 'operations__parcels__parcel_number'), - 'parcel_2': ('operations__parcels__public_domain', - 'parcels__public_domain'), - 'end_date': 'end_date__isnull', - 'towns__numero_insee__startswith': - 'towns__numero_insee__startswith', - 'name': 'name__icontains', - 'cached_label': 'cached_label__icontains', - 'comment': 'comment__icontains', - 'permit_reference': 'permit_reference__icontains', - 'general_contractor__attached_to': - 'general_contractor__attached_to__pk', - 'history_creator': 'history_creator__ishtaruser__person__pk', - 'history_modifier': 'history_modifier__ishtaruser__person__pk', - },) +get_file = get_item(models.File, 'get_file', 'file') revert_file = revert_item(models.File) @@ -113,38 +91,7 @@ show_file = show_item(models.File, 'file', extra_dct=extra_file_dct) get_administrativeactfile = get_item( AdministrativeAct, 'get_administrativeactfile', 'administrativeactfile', - associated_models=[ - (models.File, 'associated_file'), - (Person, 'associated_file__general_contractor')], - dated_fields=['signature_date__lte', 'signature_date__gte'], - extra_request_keys={ - 'year': 'signature_date__year', - 'associated_file__towns': 'associated_file__towns__pk', - 'history_creator': 'history_creator__ishtaruser__person__pk', - 'associated_file__operations__code_patriarche': - 'associated_file__operations__code_patriarche', - 'act_type__intented_to': 'act_type__intented_to', - 'act_object': 'act_object__icontains', - 'signature_date_before': 'signature_date__lte', - 'signature_date_after': 'signature_date__gte', - 'associated_file__general_contractor__attached_to': - 'associated_file__general_contractor__attached_to__pk', - 'associated_file__name': 'associated_file__name__icontains', - 'associated_file__towns__numero_insee__startswith': - 'associated_file__towns__numero_insee__startswith', - 'indexed': 'index__isnull', - 'parcel_0': ('operation__parcels__section', - 'associated_file__parcels__section'), - 'parcel_1': ( - 'operation__parcels__parcel_number', - 'associated_file__parcels__parcel_number'), - 'parcel_2': ('operations__parcels__public_domain', - 'associated_file__parcels__public_domain'), - 'associated_file__permit_reference': - 'associated_file__permit_reference__icontains'}, - reversed_bool_fields=['index__isnull'], - base_request={"associated_file__pk__isnull": False}, - relative_session_names=[('file', 'associated_file__pk')]) + base_request={"associated_file__pk__isnull": False}) def dashboard_file(request, *args, **kwargs): |