summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-24 16:32:15 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-24 16:32:15 +0200
commitb7a3d284ab687b560caae45b9ca5ac8bf8c8b46d (patch)
tree7e8d47e3370d8a213ca9888e5645bf51ea788ea0 /archaeological_files
parent3eff8cc19f8f8ef237788c752cb7c937195bb7e6 (diff)
downloadIshtar-b7a3d284ab687b560caae45b9ca5ac8bf8c8b46d.tar.bz2
Ishtar-b7a3d284ab687b560caae45b9ca5ac8bf8c8b46d.zip
Administrativ act: can modify index (refs #2248)
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/forms.py10
-rw-r--r--archaeological_files/views.py4
2 files changed, 10 insertions, 4 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 41381e0b8..369ffdaf0 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect
from ishtar_common.forms_common import get_town_field
from archaeological_operations.forms import AdministrativeActOpeForm, \
AdministrativeActOpeFormSelection, \
- ParcelField, SLICING, HEAD_SCIENTIST, SRA_AGENT
+ ParcelField, SLICING, HEAD_SCIENTIST, SRA_AGENT, AdministrativeActModifForm
from ishtar_common import widgets
GENERAL_CONTRACTOR, created = PersonType.objects.get_or_create(
@@ -538,3 +538,9 @@ class AdministrativeActFileForm(AdministrativeActOpeForm):
dct={'intented_to': 'F'})
self.fields['act_type'].help_text = ActType.get_help(
dct={'intented_to': 'F'})
+
+
+class AdministrativeActFileModifForm(AdministrativeActModifForm,
+ AdministrativeActFileForm):
+ pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
+ index = forms.IntegerField(label=_("Index"), required=False)
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index a1b453169..7e96c33d3 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -236,7 +236,7 @@ file_administrativeactfile_modification_wizard = \
('selec-file_administrativeactfile_modification',
AdministrativeActFileModifyFormSelection),
('administrativeact-file_administrativeactfile_modification',
- AdministrativeActFileForm),
+ AdministrativeActFileModifForm),
('final-file_administrativeactfile_modification', FinalForm)],
label=_(u"File: administrative act modification"),
url_name='file_administrativeactfile_modification',)