diff options
| -rw-r--r-- | archaeological_files_pdl/forms.py | 3 | ||||
| -rw-r--r-- | archaeological_files_pdl/urls.py | 6 | ||||
| -rw-r--r-- | archaeological_files_pdl/views.py | 8 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/organization_person_form.html | 2 | ||||
| -rw-r--r-- | ishtar_common/views.py | 15 |
5 files changed, 31 insertions, 3 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index fc4efff73..2703e52fd 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -164,9 +164,10 @@ class FileFormPlanningService(forms.Form): widget=widgets.JQueryPersonOrganization( reverse_lazy('autocomplete-person', args=[RESPONSIBLE_PLANNING_SERVICE.pk]), - reverse_lazy('person_create'), + reverse_lazy('townplanning_create'), model=Person, limit={'person_types':[RESPONSIBLE_PLANNING_SERVICE.pk]}, + js_template='ishtar/blocks/JQueryCorporationPerson.js', new=True), validators=[valid_id(Person)]) diff --git a/archaeological_files_pdl/urls.py b/archaeological_files_pdl/urls.py index b6878e90b..55865a696 100644 --- a/archaeological_files_pdl/urls.py +++ b/archaeological_files_pdl/urls.py @@ -24,4 +24,10 @@ from archaeological_files_pdl import views urlpatterns = patterns('', url(r'file_creation/(?P<step>.+)?$', views.file_creation_wizard, name='file_creation'), + url(r'townplanning-edit/$', + views.TownPlanningCreate.as_view(), + name='townplanning_create'), + url(r'townplanning-edit/(?P<pk>\d+)$', + views.TownPlanningEdit.as_view(), + name='townplanning_edit'), ) diff --git a/archaeological_files_pdl/views.py b/archaeological_files_pdl/views.py index 139da223d..712990234 100644 --- a/archaeological_files_pdl/views.py +++ b/archaeological_files_pdl/views.py @@ -22,6 +22,8 @@ from django.utils.translation import ugettext_lazy as _ from archaeological_files_pdl.wizards import FileWizard from archaeological_operations.wizards import is_preventive, is_not_preventive +from ishtar_common.views import OrganizationPersonCreate, OrganizationPersonEdit + from archaeological_files_pdl import forms from archaeological_files import forms as ref_forms from archaeological_operations.forms import ParcelFormSet @@ -49,3 +51,9 @@ file_creation_wizard = FileWizard.as_view([ type_key='file_type'), }, url_name='file_creation',) + +class TownPlanningEdit(OrganizationPersonEdit): + relative_label = _("File followed by") + +class TownPlanningCreate(OrganizationPersonCreate): + relative_label = _("File followed by") diff --git a/ishtar_common/templates/ishtar/organization_person_form.html b/ishtar_common/templates/ishtar/organization_person_form.html index ccc442197..46f2cdc15 100644 --- a/ishtar_common/templates/ishtar/organization_person_form.html +++ b/ishtar_common/templates/ishtar/organization_person_form.html @@ -14,7 +14,7 @@ </table> <table class='person'> -<caption>{% trans "Corporation manager" %}</caption> +<caption>{{relative_label}}</caption> <tr> <th><label>{{form.title.label}}</label></th> <td>{{form.title}}</td> diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 3c6b796db..a8ab91fb9 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -987,6 +987,13 @@ class OrganizationPersonCreate(LoginRequiredMixin, CreateView): model = models.Person form_class = forms.BaseOrganizationPersonForm template_name = 'ishtar/organization_person_form.html' + relative_label = _("Corporation manager") + + def get_context_data(self, *args, **kwargs): + data = super(OrganizationPersonCreate, self).get_context_data(*args, + **kwargs) + data['relative_label'] = self.relative_label + return data def get_success_url(self): return reverse('organization_person_edit', args=[self.object.pk]) @@ -995,7 +1002,13 @@ class OrganizationPersonEdit(LoginRequiredMixin, UpdateView): model = models.Person form_class = forms.BaseOrganizationPersonForm template_name = 'ishtar/organization_person_form.html' + relative_label = _("Corporation manager") + + def get_context_data(self, *args, **kwargs): + data = super(OrganizationPersonEdit, self).get_context_data(*args, + **kwargs) + data['relative_label'] = self.relative_label + return data def get_success_url(self): return reverse('organization_person_edit', args=[self.object.pk]) - |