diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-04 01:02:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-04 01:02:14 +0200 |
| commit | d5ddabd3098f5e6cd2a98ff3a037dcb2da011391 (patch) | |
| tree | a16d028952f536a80ec6642af2b0f115cf4caf69 | |
| parent | f6dc6ffebbe7c85acb1d19021757abbacf363566 (diff) | |
| download | Ishtar-d5ddabd3098f5e6cd2a98ff3a037dcb2da011391.tar.bz2 Ishtar-d5ddabd3098f5e6cd2a98ff3a037dcb2da011391.zip | |
Hide an inappropriate warning message (closes #485)
| -rw-r--r-- | ishtar/ishtar_base/forms_operations.py | 8 | ||||
| -rw-r--r-- | ishtar/ishtar_base/models.py | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar/ishtar_base/forms_operations.py index 8b10f6e38..7274e66b5 100644 --- a/ishtar/ishtar_base/forms_operations.py +++ b/ishtar/ishtar_base/forms_operations.py @@ -173,10 +173,10 @@ class OperationWizard(Wizard): Show a specific warning if no archaelogical file is provided """ datas = super(OperationWizard, self).get_formated_datas(forms) - # simple selection town is used if no Archaelogical File is provided - has_af = [form for form in forms - if isinstance(form, SelectedTownFormSet)] - if not has_af: + # if the general town form is used the advertissement is pertinent + has_no_af = [form.prefix for form in forms + if form.prefix == 'townsgeneral-operation'] and True + if has_no_af: datas = [[_(u"Warning: No Archaelogical File is provided. " u"If you have forget it return to the first step."), []]]\ + datas diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py index d8aa73059..29a97ee83 100644 --- a/ishtar/ishtar_base/models.py +++ b/ishtar/ishtar_base/models.py @@ -826,7 +826,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), related_name='context_record') label = models.CharField(_(u"ID"), max_length=200) - description = models.TextField(_("Description"), blank=True, null=True) + description = models.TextField(_(u"Description"), blank=True, null=True) length = models.IntegerField(_(u"Length (cm)"), blank=True, null=True) width = models.IntegerField(_(u"Width (cm)"), blank=True, null=True) thickness = models.IntegerField(_(u"Thickness (cm)"), blank=True, null=True) @@ -843,15 +843,15 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): interpretation = models.TextField(_(u"Interpretation"), blank=True, null=True) taq = models.IntegerField(_(u"TAQ"), blank=True, null=True, - help_text=_("\"Terminus Ante Quem\" the context record can't have been " + help_text=_(u"\"Terminus Ante Quem\" the context record can't have been " "created after this date")) taq_estimated = models.IntegerField(_(u"Estimated TAQ"), blank=True, - null=True, help_text=_("Estimation of a \"Terminus Ante Quem\"")) + null=True, help_text=_(u"Estimation of a \"Terminus Ante Quem\"")) tpq = models.IntegerField(_(u"TPQ"), blank=True, null=True, - help_text=_("\"Terminus Post Quem\" the context record can't have been " + help_text=_(u"\"Terminus Post Quem\" the context record can't have been " " created before this date")) tpq_estimated = models.IntegerField(_(u"Estimated TPQ"), blank=True, - null=True, help_text=_("Estimation of a \"Terminus Post Quem\"")) + null=True, help_text=_(u"Estimation of a \"Terminus Post Quem\"")) identification = models.ForeignKey(IdentificationType, blank=True, null=True, verbose_name=_(u"Identification"),) activity = models.ForeignKey(ActivityType,blank=True, null=True, |