summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-04-01 01:01:48 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-04-01 01:01:48 +0200
commit195f7eb41a8f72d694b5604c38bc4d050026109a (patch)
tree19b2b93f8897b10bbb3806e23763c2973ca00498 /ishtar/furnitures/views.py
parent12170e1a50767922b548005b851bd87ac749356c (diff)
downloadIshtar-195f7eb41a8f72d694b5604c38bc4d050026109a.tar.bz2
Ishtar-195f7eb41a8f72d694b5604c38bc4d050026109a.zip
Distinct administrative act for Operations and Files in session management (closes #209)
Diffstat (limited to 'ishtar/furnitures/views.py')
-rw-r--r--ishtar/furnitures/views.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py
index 2ea508b29..c3b7f6f4e 100644
--- a/ishtar/furnitures/views.py
+++ b/ishtar/furnitures/views.py
@@ -375,10 +375,16 @@ def autocomplete_operation(request, non_closed=True):
get_operation = get_item(models.Operation, 'get_operation', 'operation')
show_operation = show_item(models.Operation, 'operation')
-get_administrativeact = get_item(models.AdministrativeAct,
- 'get_administrativeact', 'administrativeact',
+get_administrativeactfile = get_item(models.AdministrativeAct,
+ 'get_administrativeactfile', 'administrativeactfile',
extra_request_keys={'associated_file__towns':'associated_file__towns__pk',
- 'operation__towns':'operation__towns__pk'})
+ 'operation__towns':'operation__towns__pk',
+ 'act_type__intented_to':'act_type__intented_to'})
+get_administrativeactop = get_item(models.AdministrativeAct,
+ 'get_administrativeactop', 'administrativeactop',
+ extra_request_keys={'associated_file__towns':'associated_file__towns__pk',
+ 'operation__towns':'operation__towns__pk',
+ 'act_type__intented_to':'act_type__intented_to'})
def autocomplete_organization(request, orga_type=None):
if not request.user.has_perm('furnitures.view_organization',