diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-08-19 15:12:43 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-08-19 15:12:43 +0200 |
commit | ab53d8cfdcfbbaff8cc5b6bc0e44ee923485d9bb (patch) | |
tree | 840ab617f2927fec8143f6005cfd2d498d1c738f /archaeological_context_records | |
parent | b4a8dcb2836c202edf250c9953327a9ca5280004 (diff) | |
download | Ishtar-ab53d8cfdcfbbaff8cc5b6bc0e44ee923485d9bb.tar.bz2 Ishtar-ab53d8cfdcfbbaff8cc5b6bc0e44ee923485d9bb.zip |
Archaeological files: change planning service management
Diffstat (limited to 'archaeological_context_records')
-rw-r--r-- | archaeological_context_records/forms.py | 12 | ||||
-rw-r--r-- | archaeological_context_records/views.py | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 34f1a5101..2a9071f64 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -20,14 +20,12 @@ """ Context records forms definitions """ -import datetime from itertools import groupby from django import forms from django.conf import settings from django.core import validators -from django.core.exceptions import ObjectDoesNotExist -from django.db.models import Max +from django.forms.formsets import formset_factory from django.utils.translation import ugettext_lazy as _ from ishtar_common.models import valid_id @@ -35,12 +33,12 @@ from archaeological_operations.models import Period, Parcel, Operation import models from ishtar_common import widgets -from ishtar_common.forms import FinalForm, FinalForm, FormSet, \ - formset_factory, get_now, reverse_lazy, get_form_selection, TableSelect -from ishtar_common.forms_common import get_town_field, SourceForm, \ - SourceSelect, AuthorFormset +from ishtar_common.forms import FinalForm, FormSet, \ + reverse_lazy, get_form_selection, TableSelect +from ishtar_common.forms_common import get_town_field, SourceSelect from archaeological_operations.forms import OperationSelect, ParcelField + class RecordSelect(TableSelect): label = forms.CharField(label=_(u"ID"), max_length=100) parcel__town = get_town_field() diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 73e1cd7b3..526f5aca6 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -21,6 +21,7 @@ from django.core.urlresolvers import reverse from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ +from ishtar_common.forms_common import AuthorFormset, SourceForm from ishtar_common.views import get_item, show_item, revert_item from ishtar_common.wizards import SearchWizard from wizards import * |