diff options
| -rw-r--r-- | ishtar/ishtar_base/context_processors.py | 7 | ||||
| -rw-r--r-- | ishtar/ishtar_base/forms.py | 5 | ||||
| -rw-r--r-- | ishtar/ishtar_base/models.py | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ishtar/ishtar_base/context_processors.py b/ishtar/ishtar_base/context_processors.py index c4eb546f3..2dc06c6f8 100644 --- a/ishtar/ishtar_base/context_processors.py +++ b/ishtar/ishtar_base/context_processors.py @@ -39,8 +39,11 @@ def get_base_context(request): dct['JQUERY_URL'] = settings.JQUERY_URL dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL dct['current_menu'] = [] - for lbl, model in ((_(u"Archaelogical file"), models.File), - (_(u"Operation"), models.Operation)): + for lbl, model in ((_(u"Archaeological file"), models.File), + (_(u"Operation"), models.Operation), + (_(u"Context record"), models.ContextRecord), + (_(u"Archaeological item"), models.Item), + ): model_name = model.__name__.lower() current = model_name in request.session and request.session[model_name] items = [] diff --git a/ishtar/ishtar_base/forms.py b/ishtar/ishtar_base/forms.py index d5811f38e..0bed1b28d 100644 --- a/ishtar/ishtar_base/forms.py +++ b/ishtar/ishtar_base/forms.py @@ -315,7 +315,6 @@ class Wizard(NamedUrlSessionFormWizard): form_list, return_object): dct = self.get_extra_model(dct, request, storage, form_list) obj = self.get_current_saved_object(request, storage) - # manage dependant items other_objs = {} for k in dct.keys(): @@ -334,7 +333,7 @@ class Wizard(NamedUrlSessionFormWizard): setattr(obj, k, dct[k]) try: obj.full_clean() - except ValidationError, msg: + except forms.ValidationError, msg: return self.render(request, storage, form_list[-1]) for dependant_item in other_objs: c_item = getattr(obj, dependant_item) @@ -375,7 +374,7 @@ class Wizard(NamedUrlSessionFormWizard): obj = self.get_saved_model()(**dct) try: obj.full_clean() - except ValidationError, msg: + except forms.ValidationError, msg: return self.render(request, storage, form_list[-1]) obj.save() for k in adds: diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py index 6de782fcf..4c4cdfc2e 100644 --- a/ishtar/ishtar_base/models.py +++ b/ishtar/ishtar_base/models.py @@ -551,7 +551,7 @@ class File(BaseHistorizedItem, OwnPerms): null=True, blank=True) postal_code = models.CharField(_(u"Main address - postal code"), max_length=10, null=True, blank=True) - comment = models.TextField(_(u"Comment")) + comment = models.TextField(_(u"Comment"), null=True, blank=True) history = HistoricalRecords() class Meta: @@ -898,7 +898,6 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): return JOINT.join([unicode(item) for item in [self.parcel, self.label] if item]) - def full_label(self): if not self.parcel.operation: return unicode(self) |