diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-22 13:41:02 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-22 13:41:02 +0200 |
| commit | dafc5d16f3095bad00356b6198afcd5bbeab61d6 (patch) | |
| tree | 7040d1fd325ba67b890122059a8f50a3857e332a /archaeological_operations/forms.py | |
| parent | 64bb69c03ce1688c72b3f7ebd0e1550cd941aa69 (diff) | |
| parent | 0ecd905165193897129a71a1e8203232f0b2b68c (diff) | |
| download | Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.tar.bz2 Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/forms.py')
| -rw-r--r-- | archaeological_operations/forms.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index fc1003576..a12f245cb 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -261,8 +261,8 @@ class ParcelFormSet(FormSet): except models.Parcel.DoesNotExist: continue ordering_keys[number] = [ - parcel.town, parcel.year, parcel.section, - parcel.parcel_number] + parcel.public_domain, parcel.town, parcel.year, + parcel.section, parcel.parcel_number] continue if number not in ordering_keys: ordering_keys[number] = ['', '', '', '', ''] @@ -844,7 +844,7 @@ class OperationFormGeneral(ManageOldType, forms.Form): u"(ratio is preserved).</p>") % { 'width': settings.IMAGE_MAX_SIZE[0], 'height': settings.IMAGE_MAX_SIZE[1]}), - required=False, widget=widgets.ImageFileInput()) + max_length=255, required=False, widget=widgets.ImageFileInput()) def __init__(self, *args, **kwargs): super(OperationFormGeneral, self).__init__(*args, **kwargs) |