diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 20:41:41 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 20:41:41 +0200 |
commit | 7ccc29e5c41fe8a4a33c803adc4bbbd94d6ad1d7 (patch) | |
tree | 3e8a369eb94465c8ae02201a613f9ca32aeaf741 /archaeological_finds/forms.py | |
parent | dac23f0753d81396aed54a2297195af416e03a6f (diff) | |
download | Ishtar-7ccc29e5c41fe8a4a33c803adc4bbbd94d6ad1d7.tar.bz2 Ishtar-7ccc29e5c41fe8a4a33c803adc4bbbd94d6ad1d7.zip |
Djangoization - Major refactoring (step 12)
* Fix finds wizards
Diffstat (limited to 'archaeological_finds/forms.py')
-rw-r--r-- | archaeological_finds/forms.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 21593a450..9c682b25a 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -23,27 +23,26 @@ Finds forms definitions import datetime from django import forms -from django.shortcuts import render_to_response -from django.template import RequestContext +from django.conf import settings from django.core import validators from django.core.exceptions import ObjectDoesNotExist -from django.utils.safestring import mark_safe 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 ishtar import settings - -from ishtar_common.models import Person, valid_id +from ishtar_common.models import Person, valid_id, valid_ids from archaeological_operations.models import Period, OperationType from archaeological_context_records.models import DatingType, DatingQuality from archaeological_warehouse.models import Warehouse, ContainerType, Container import models -import widgets -from forms import FinalForm, FormSet,\ - FloatField, formset_factory, get_now, get_form_selection, reverse_lazy -from forms_common import get_town_field, get_warehouse_field, SourceForm, \ - SourceSelect, SourceDeletionForm, AuthorFormset -from forms_context_records import RecordFormSelection + +from ishtar_common import widgets +from ishtar_common.forms import FinalForm, FormSet, FloatField, \ + formset_factory, get_now, get_form_selection, reverse_lazy +from ishtar_common.forms_common import get_town_field, get_warehouse_field, \ + SourceForm, SourceSelect, SourceDeletionForm, AuthorFormset +from archaeological_context_records.forms import RecordFormSelection class FindForm(forms.Form): form_label = _("Find") @@ -260,6 +259,7 @@ FindSourceFormSelection = get_form_selection( _(u"You should select a document.")) +""" #################################### # Source management for treatments # #################################### @@ -282,6 +282,7 @@ class TreatmentSourceSelect(SourceSelect): self.fields['operation__operation_type'].help_text = \ OperationType.get_help() +""" """ OperationSourceFormSelection = get_form_selection( |