diff options
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 7ae6063bc..3af75da23 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -40,7 +40,8 @@ def autocomplete_patriarche(request, non_closed=True): models.Operation) and not request.user.has_perm('ishtar_common.view_own_operation', models.Operation) - and not request.user.ishtaruser.has_right('operation_search')): + and not request.user.ishtaruser.has_right( + 'operation_search', session=request.session)): return HttpResponse(mimetype='text/plain') if not request.GET.get('term'): return HttpResponse(mimetype='text/plain') @@ -90,9 +91,10 @@ def autocomplete_operation(request, non_closed=True): # person_types = request.user.ishtaruser.person.person_type if (not request.user.has_perm('ishtar_common.view_operation', models.Operation) - and not request.user.has_perm('ishtar_common.view_own_operation', - models.Operation) - and not request.user.ishtaruser.has_right('operation_search')): + and not request.user.has_perm( + 'ishtar_common.view_own_operation', models.Operation) + and not request.user.ishtaruser.has_right( + 'operation_search', session=request.session)): return HttpResponse(mimetype='text/plain') if not request.GET.get('term'): return HttpResponse(mimetype='text/plain') @@ -116,10 +118,10 @@ def autocomplete_operation(request, non_closed=True): def get_available_operation_code(request, year=None): - if not request.user.has_perm('ishtar_common.view_operation', - models.Operation)\ - and not request.user.has_perm('ishtar_common.view_own_operation', - models.Operation): + if not request.user.has_perm( + 'ishtar_common.view_operation', models.Operation)\ + and not request.user.has_perm( + 'ishtar_common.view_own_operation', models.Operation): return HttpResponse(mimetype='text/plain') data = json.dumps({'id': models.Operation.get_available_operation_code(year)}) @@ -365,10 +367,10 @@ administrativact_register_wizard = SearchWizard.as_view([ def generatedoc_administrativeactop(request, pk, template_pk=None): - if (not request.user.has_perm('ishtar_common.view_operation', - models.Operation) - and not request.user.has_perm('ishtar_common.view_own_operation', - models.Operation)): + if (not request.user.has_perm( + 'ishtar_common.view_operation', models.Operation) + and not request.user.has_perm( + 'ishtar_common.view_own_operation', models.Operation)): return HttpResponse(mimetype='text/plain') try: act_file = models.AdministrativeAct.objects.get(pk=pk) |