summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-16 17:52:02 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-16 17:52:02 +0200
commitd7032e2aac05e7bbe08a3d1bccbeb77adb70ff77 (patch)
treea920f18748bf36f42e188821ccbf752d8d00853a
parent74b5ed4972570919f2655948b9c2655892ae19c8 (diff)
downloadIshtar-d7032e2aac05e7bbe08a3d1bccbeb77adb70ff77.tar.bz2
Ishtar-d7032e2aac05e7bbe08a3d1bccbeb77adb70ff77.zip
Person - Organization: add full export (refs #3039)
-rw-r--r--ishtar_common/forms.py2
-rw-r--r--ishtar_common/forms_common.py11
-rw-r--r--ishtar_common/urls.py4
3 files changed, 12 insertions, 5 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 5e0d14eb8..b851c95b2 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/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
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index a9873cb0a..6fdee55cb 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -208,8 +208,10 @@ class OrganizationFormSelection(forms.Form):
currents = {'pk': models.Organization}
pk = forms.IntegerField(
label="",
- widget=widgets.JQueryJqGrid(reverse_lazy('get-organization'),
- OrganizationSelect, models.Organization),
+ widget=widgets.JQueryJqGrid(
+ reverse_lazy('get-organization'), OrganizationSelect,
+ models.Organization,
+ source_full=reverse_lazy('get-organization-full')),
validators=[models.valid_id(models.Organization)])
@@ -245,8 +247,9 @@ class PersonFormSelection(forms.Form):
currents = {'pk': models.Person}
pk = forms.IntegerField(
label="",
- widget=widgets.JQueryJqGrid(reverse_lazy('get-person'),
- PersonSelect, models.Person),
+ widget=widgets.JQueryJqGrid(
+ reverse_lazy('get-person'), PersonSelect, models.Person,
+ source_full=reverse_lazy('get-person-full')),
validators=[models.valid_id(models.Person)])
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 30b5741d9..daaac77e3 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -139,6 +139,8 @@ urlpatterns += patterns(
name='autocomplete-person-permissive'),
url(r'get-person/(?P<type>.+)?$', 'get_person',
name='get-person'),
+ url(r'get-person-full/(?P<type>.+)?$', 'get_person',
+ name='get-person-full', kwargs={'full': True}),
url(r'show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$',
'show_person', name='show-person'),
url(r'department-by-state/(?P<state_id>.+)?$', 'department_by_state',
@@ -158,6 +160,8 @@ urlpatterns += patterns(
'new_organization', name='new-organization'),
url(r'get-organization/(?P<type>.+)?$', 'get_organization',
name='get-organization'),
+ url(r'get-organization-full/(?P<type>.+)?$', 'get_organization',
+ name='get-organization-full', kwargs={'full': True}),
url(r'show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$',
'show_organization', name='show-organization'),
url(r'autocomplete-organization/([0-9_]+)?$',