diff options
Diffstat (limited to 'archaeological_files/forms.py')
| -rw-r--r-- | archaeological_files/forms.py | 20 | 
1 files changed, 7 insertions, 13 deletions
| diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index ed9e24d10..f65ee85c0 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -126,7 +126,6 @@ class FileFormGeneral(forms.Form):                                            validators.MaxValueValidator(2100)])      numeric_reference = forms.IntegerField(label=_("Numeric reference"),                  widget=forms.HiddenInput, required=False) -    _internal_reference_ro = False      internal_reference = forms.CharField(label=_(u"Other reference"),                                         max_length=60, required=False)      name = forms.CharField(label=_(u"Name"), required=False) @@ -144,24 +143,19 @@ class FileFormGeneral(forms.Form):          super(FileFormGeneral, self).__init__(*args, **kwargs)          self.fields['file_type'].choices = models.FileType.get_types()          self.fields['file_type'].help_text = models.FileType.get_help() -        if not self._internal_reference_ro: -            q = models.File.objects.filter(internal_reference__isnull=False -                       ).exclude(internal_reference='').order_by('-pk') -            if q.count(): -                lbl = self.fields['internal_reference'].label -                lbl += _(u"<br/>(last recorded: %s)") % ( -                                    q.all()[0].internal_reference) -                self.fields['internal_reference'].label = mark_safe(lbl) +        q = models.File.objects.filter(internal_reference__isnull=False +                   ).exclude(internal_reference='').order_by('-pk') +        if q.count(): +            lbl = self.fields['internal_reference'].label +            lbl += _(u"<br/>(last recorded: %s)") % ( +                                q.all()[0].internal_reference) +            self.fields['internal_reference'].label = mark_safe(lbl)  class FileFormGeneralRO(FileFormGeneral):      year = forms.IntegerField(label=_(u"Year"),                          widget=forms.TextInput(attrs={'readonly':True}))      numeric_reference = forms.IntegerField(label=_(u"Numeric reference"),                          widget=forms.TextInput(attrs={'readonly':True})) -    _internal_reference_ro = True -    internal_reference = forms.CharField(label=_(u"Other reference"), -                        widget=forms.TextInput(attrs={'readonly':True},), -                        required=False)  class FileFormAddress(forms.Form):      form_label = _(u"Address")  | 
