diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-08-19 15:12:43 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-08-19 15:12:43 +0200 | 
| commit | ab53d8cfdcfbbaff8cc5b6bc0e44ee923485d9bb (patch) | |
| tree | 840ab617f2927fec8143f6005cfd2d498d1c738f /archaeological_finds/views.py | |
| parent | b4a8dcb2836c202edf250c9953327a9ca5280004 (diff) | |
| download | Ishtar-ab53d8cfdcfbbaff8cc5b6bc0e44ee923485d9bb.tar.bz2 Ishtar-ab53d8cfdcfbbaff8cc5b6bc0e44ee923485d9bb.zip  | |
Archaeological files: change planning service management
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 44 | 
1 files changed, 27 insertions, 17 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index b5a3debce..63a173edb 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -21,16 +21,23 @@ from django.core.urlresolvers import reverse  from django.shortcuts import redirect  from django.utils.translation import ugettext_lazy as _ +from ishtar_common.forms import FinalForm +from ishtar_common.forms_common import SourceForm, AuthorFormset, \ +    SourceDeletionForm +from archaeological_context_records.forms import RecordFormSelection +  from ishtar_common.views import get_item, show_item, revert_item  from ishtar_common.wizards import SearchWizard +  from wizards import *  from forms import *  import models -get_find = get_item(models.Find, 'get_find', 'find', -    bool_fields = ['base_finds__is_isolated'], -    reversed_bool_fields = ['image__isnull'], -    base_request={'downstream_treatment__isnull':True}, +get_find = get_item( +    models.Find, 'get_find', 'find', +    bool_fields=['base_finds__is_isolated'], +    reversed_bool_fields=['image__isnull'], +    base_request={'downstream_treatment__isnull': True},      extra_request_keys={          'base_finds__context_record__parcel__town':              'base_finds__context_record__parcel__town', @@ -38,18 +45,19 @@ get_find = get_item(models.Find, 'get_find', 'find',              'base_finds__context_record__operation__year__contains',          'base_finds__context_record__operation__code_patriarche':              'base_finds__context_record__operation__code_patriarche', -        'dating__period':'dating__period__pk', +        'dating__period': 'dating__period__pk',          'base_finds__find__description':              'base_finds__find__description__icontains', -        'base_finds__is_isolated':'base_finds__is_isolated', -        'image':'image__isnull'}) -get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource', +        'base_finds__is_isolated': 'base_finds__is_isolated', +        'image': 'image__isnull'}) +get_findsource = get_item( +    models.FindSource, 'get_findsource', 'findsource',      extra_request_keys={          'find__context_record__operation__year':              'find__context_record__operation__year', -        'find__dating__period':'find__dating__period__pk', -        'find__description':'find__description__icontains', -}) +        'find__dating__period': 'find__dating__period__pk', +        'find__description': 'find__description__icontains', +    })  show_find = show_item(models.Find, 'find')  revert_find = revert_item(models.Find) @@ -74,12 +82,14 @@ find_modification_wizard = FindModificationWizard.as_view([      label=_(u"Find modification"),      url_name='find_modification',) +  def find_modify(request, pk): -    view = find_modification_wizard(request) +    # view = find_modification_wizard(request)      FindModificationWizard.session_set_value( -                    request, 'selec-find_modification', 'pk', pk, reset=True) -    return redirect(reverse('find_modification', -                            kwargs={'step':'find-find_modification'})) +        request, 'selec-find_modification', 'pk', pk, reset=True) +    return redirect( +        reverse('find_modification', +                kwargs={'step': 'find-find_modification'}))  find_source_creation_wizard = FindSourceWizard.as_view([ @@ -116,8 +126,8 @@ treatment_creation_wizard = TreatmentWizard.as_view([      condition_dict={          'selecfind-treatment_creation':              check_treatment('basetreatment-treatment_creation', -                           'treatment_type', not_type_list=['physical_grouping', -                                                            'packaging']), +                          'treatment_type', not_type_list=['physical_grouping', +                                                           'packaging']),          'multiselecfinds-treatment_creation':              check_treatment('basetreatment-treatment_creation',                              'treatment_type', ['physical_grouping',  | 
