diff options
Diffstat (limited to 'archaeological_files_pdl/wizards.py')
| -rw-r--r-- | archaeological_files_pdl/wizards.py | 48 | 
1 files changed, 32 insertions, 16 deletions
| diff --git a/archaeological_files_pdl/wizards.py b/archaeological_files_pdl/wizards.py index 61294e538..c64c70eab 100644 --- a/archaeological_files_pdl/wizards.py +++ b/archaeological_files_pdl/wizards.py @@ -85,24 +85,40 @@ class FileWizard(BaseFileWizard):              if saisine_type:                  context['saisine_type'] = unicode(saisine_type)                  context['saisine_type_delay'] = saisine_type.delay or 0 -        elif self.steps.current == formfinal and \ -                self.steps.current.endswith('creation'):  # creation only -            parcels = [] -            parcel_step_key = self.parcel_step_key + self.url_name - -            parcel_numbers = self.session_get_value( -                parcel_step_key, 'parcel_number', multi=True) or [] -            sections = self.session_get_value( -                parcel_step_key, 'section', multi=True) or [] -            towns = self.session_get_value( -                parcel_step_key, 'town', multi=True) or [] -            for idx, parcel_number in enumerate(parcel_numbers): -                if not parcel_number: -                    continue -                parcels.append({'town': towns[idx], +        elif self.steps.current == formfinal: +            if self.steps.current.endswith('creation'):  # creation only +                parcels = [] +                parcel_step_key = self.parcel_step_key + self.url_name + +                parcel_numbers = self.session_get_value( +                    parcel_step_key, 'parcel_number', multi=True) or [] +                sections = self.session_get_value( +                    parcel_step_key, 'section', multi=True) or [] +                towns = self.session_get_value( +                    parcel_step_key, 'town', multi=True) or [] +                for idx, parcel_number in enumerate(parcel_numbers): +                    if not parcel_number: +                        continue +                    parcels.append({ +                        'town': towns[idx],                          'section': sections[idx],                          'parcel_number': parcel_number}) -            context['similar_files'] = models.File.similar_files(parcels) +                context['similar_files'] = models.File.similar_files(parcels) +            else:  # edition only +                try: +                    numeric_reference = int( +                        self.session_get_value( +                            'instruction-' + self.url_name, +                            'numeric_reference')) + +                    q = models.File.objects.filter( +                        numeric_reference=numeric_reference, +                        year=self.get_current_year()).exclude( +                        pk=self.get_current_object().pk) +                    context['numeric_reference_files'] = q.all() +                except ValueError: +                    pass +          return context | 
