Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

1 files changed, 5 insertions, 3 deletions

diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py
index e2f6722ef..c475de47d 100644
--- a/archaeological_files/wizards.py
+++ b/archaeological_files/wizards.py
@@ -25,16 +25,18 @@ from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.wizards import Wizard, ClosingWizard
-from archaeological_operations.wizards import OperationAdministrativeActWizard,\
+from archaeological_operations.wizards import OperationWizard,\
+                                              OperationAdministrativeActWizard,\
                                               AdministrativeActDeletionWizard
 from ishtar_common.models import Town
 from archaeological_operations.models import AdministrativeAct, Parcel, \
                                              Operation
 import models
 
-class FileWizard(Wizard):
+class FileWizard(OperationWizard):
     model = models.File
     object_parcel_type = 'associated_file'
+    parcel_step_key = 'parcels-'
 
     def get_form(self, step=None, data=None, files=None):
         """
@@ -103,7 +105,7 @@ class FileWizard(Wizard):
                     continue
                 try:
                     dct['town'] = models.Town.objects.get(pk=int(dct['town']))
-                except (ValueError, ObjectDoesNotExist):
+                except (ValueError, ObjectDoesNotExist, KeyError):
                     continue
                 dct['associated_file'], dct['operation'] = None, None
                 dct[self.object_parcel_type] = obj