diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-28 19:58:05 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-28 19:58:05 +0100 | 
| commit | cbbd1cb8c4ef3c2dbd4ef6c752810f151809a189 (patch) | |
| tree | 95ab13508e4c16862a2d7131352daab81ee7d2ea | |
| parent | c10b0bac3f5d5ee61d7789de4db0fbb18dd666d3 (diff) | |
| download | Ishtar-cbbd1cb8c4ef3c2dbd4ef6c752810f151809a189.tar.bz2 Ishtar-cbbd1cb8c4ef3c2dbd4ef6c752810f151809a189.zip | |
Add the reference of the last recorded file in the label (refs #625)
| -rw-r--r-- | archaeological_files/forms.py | 10 | 
1 files changed, 9 insertions, 1 deletions
| diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 544c89048..2adc58ba1 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -30,6 +30,7 @@ from django.db.models import Max  from django.shortcuts import render_to_response  from django.template import RequestContext  from django.utils.translation import ugettext_lazy as _ +from django.utils.safestring import mark_safe  from ishtar_common.models import Person, PersonType, Town, Organization, \                                   OrganizationType, valid_id, is_unique @@ -97,7 +98,7 @@ class FileFormGeneral(forms.Form):                                            validators.MaxValueValidator(2100)])      numeric_reference = forms.IntegerField(label=_("Numeric reference"),                  widget=forms.HiddenInput, required=False) -    internal_reference = forms.CharField(label=_(u"Internal reference"), +    internal_reference = forms.CharField(label=_(u"Reference"),              max_length=60,              validators=[is_unique(models.File, 'internal_reference')])      name = forms.CharField(label=_(u"Name"), required=False) @@ -115,6 +116,13 @@ 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() +        q = models.File.objects.filter(internal_reference__isnull=False +                       ).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"), | 
