diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/forms.py | 1 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 10 | ||||
| -rw-r--r-- | archaeological_operations/wizards.py | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index d87e72423..dc342f477 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -29,6 +29,7 @@ from django.template import RequestContext from django.core import validators from django.core.exceptions import ObjectDoesNotExist from django.db.models import Max +from django.forms.formsets import DELETION_FIELD_NAME from django.utils.translation import ugettext_lazy as _ from ishtar_common.models import valid_id, PersonType, Person, Town diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 2c008ef9b..60de936d2 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -129,7 +129,7 @@ class Operation(BaseHistorizedItem, OwnPerms): items[0] = unicode(self.towns.all()[0]) items.append("-".join((unicode(self.year), unicode(self.operation_code)))) - return JOINT.join(items) + return settings.JOINT.join(items) @classmethod def get_available_operation_code(cls, year=None): @@ -301,7 +301,7 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part")) ) def __unicode__(self): - return JOINT.join([unicode(item) + return settings.JOINT.join([unicode(item) for item in [self.operation, self.associated_file, self.act_object] if item]) @@ -322,7 +322,7 @@ class Parcel(LightHistorizedItem): verbose_name_plural = _(u"Parcels") def short_label(self): - return JOINT.join([unicode(item) for item in [self.section, + return settings.JOINT.join([unicode(item) for item in [self.section, self.parcel_number] if item]) def __unicode__(self): @@ -332,7 +332,7 @@ class Parcel(LightHistorizedItem): items = [unicode(self.operation or self.associated_file)] items += [unicode(item) for item in [self.section, self.parcel_number] if item] - return JOINT.join(items) + return settings.JOINT.join(items) class ParcelOwner(LightHistorizedItem): owner = models.ForeignKey(Person, verbose_name=_(u"Owner")) @@ -345,7 +345,7 @@ class ParcelOwner(LightHistorizedItem): verbose_name_plural = _(u"Parcel owners") def __unicode__(self): - return self.owner + JOINT + self.parcel + return self.owner + settings.JOINT + self.parcel class OperationDashboard: def __init__(self): diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index df785fe6e..542d0118b 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -45,7 +45,8 @@ class OperationWizard(Wizard): """ context = super(OperationWizard, self).get_extra_context(request, storage) - step = self.determine_step(request, storage) + #step = self.determine_step(request, storage) + step = self.steps.current if not step.startswith('towns-'): return context context['TOWNS'] = self.get_towns(request, storage) @@ -79,7 +80,8 @@ class OperationWizard(Wizard): else: data = {} if not step: - step = self.determine_step(request, storage) + #step = self.determine_step(request, storage) + step = self.steps.current form = self.get_form_list(request, storage)[step] general_form_key = 'general-' + self.url_name # manage the dynamic choice of towns @@ -229,7 +231,9 @@ class AdministrativeActDeletionWizard(ClosingWizard): context_instance=RequestContext(request)) def is_preventive(form_name, model, type_key='operation_type', key=''): - def func(self, request, storage): + def func(self): + request = self.request + storage = self.storage if storage.prefix not in request.session or \ 'step_data' not in request.session[storage.prefix] or \ form_name not in request.session[storage.prefix]['step_data'] or\ @@ -238,7 +242,7 @@ def is_preventive(form_name, model, type_key='operation_type', key=''): return False try: typ = int(request.session[storage.prefix]['step_data']\ - [form_name][form_name+'-'+type_key]) + [form_name][form_name+'-'+type_key][0]) return model.is_preventive(typ, key) except ValueError: return False |