diff options
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 24 | ||||
| -rw-r--r-- | archaeological_files/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_files/views.py | 3 |
3 files changed, 4 insertions, 25 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index b97ca9f15..755c565f2 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -33,7 +33,7 @@ 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, DocumentTemplate + OrganizationType, valid_id, is_unique from archaeological_operations.models import ActType, AdministrativeAct import models from ishtar_common.forms import FinalForm, FormSet, ClosingDateFormSelection, \ @@ -224,28 +224,6 @@ class FinalFileDeleteForm(FinalForm): confirm_msg = " " confirm_end_msg = _(u"Would you like to delete this archaelogical file ?") -class DocumentGenerationAdminActForm(forms.Form): - _associated_model = AdministrativeAct - document_template = forms.ChoiceField(label=_("Template"), choices=[]) - - def __init__(self, *args, **kwargs): - super(DocumentGenerationAdminActForm, self).__init__(*args, **kwargs) - self.fields['document_template'].choices = DocumentTemplate.get_tuples( - dct={'associated_object_name': - 'archaeological_operations.models.AdministrativeAct'}) - - def save(self, object_pk): - try: - c_object = self._associated_model.objects.get(pk=object_pk) - except self._associated_model.DoesNotExist: - return - try: - template = DocumentTemplate.objects.get( - pk=self.cleaned_data.get('document_template')) - except DocumentTemplate.DoesNotExist: - return - return template.publish(c_object) - class AdministrativeActFileSelect(TableSelect): associated_file__towns = get_town_field() act_type = forms.ChoiceField(label=_("Act type"), choices=[]) diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index 9d1f4f56f..bbac3a052 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -62,5 +62,5 @@ urlpatterns += patterns('archaeological_files.views', url(r'dashboard_file/$', 'dashboard_file', name='dashboard-file'), url(r'file_administrativeact_document/$', 'file_administrativeactfile_document', - name='administrativeact_document'), + name='file-administrativeact-document'), ) diff --git a/archaeological_files/views.py b/archaeological_files/views.py index ae4c70f61..6ce194e52 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -35,7 +35,8 @@ from archaeological_operations.wizards import is_preventive from wizards import * from ishtar_common.forms_common import TownFormset -from archaeological_operations.forms import ParcelFormSet +from archaeological_operations.forms import ParcelFormSet, \ + DocumentGenerationAdminActForm from forms import * from archaeological_operations.views import generatedoc_administrativeactop |