summaryrefslogtreecommitdiff
path: root/archaeological_finds/views.py
diff options
context:
space:
mode:
authorQuentin André <quentin.andre@imt-atlantique.net>2021-07-09 16:43:39 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-07-08 09:58:48 +0200
commitaae2531c342bdd674c8d54aaf6c4dbf481655249 (patch)
treedbee6b76b8eda1985d1e103fe5140bb7a56c3fbd /archaeological_finds/views.py
parentee4918a011a0a4d77c5e7befda0fefb719877207 (diff)
downloadIshtar-aae2531c342bdd674c8d54aaf6c4dbf481655249.tar.bz2
Ishtar-aae2531c342bdd674c8d54aaf6c4dbf481655249.zip
modified urls and black reformatting
Diffstat (limited to 'archaeological_finds/views.py')
-rw-r--r--archaeological_finds/views.py116
1 files changed, 58 insertions, 58 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 957b1952c..436037b3a 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -156,13 +156,13 @@ get_administrativeacttreatmentfile = get_item(
def autocomplete_treatmentfile(request):
if (
- not request.user.has_perm("ishtar_common.view_treatment", models.Treatment)
- and not request.user.has_perm(
- "ishtar_common.view_own_treatment", models.Treatment
- )
- and not request.user.ishtaruser.has_right(
- "treatmentfile_search", session=request.session
- )
+ not request.user.has_perm("ishtar_common.view_treatment", models.Treatment)
+ and not request.user.has_perm(
+ "ishtar_common.view_own_treatment", models.Treatment
+ )
+ and not request.user.ishtaruser.has_right(
+ "treatmentfile_search", session=request.session
+ )
):
return HttpResponse(content_type="text/plain")
if not request.GET.get("term"):
@@ -172,9 +172,9 @@ def autocomplete_treatmentfile(request):
for q1 in q.split(" "):
for q in q1.split(" "):
extra = (
- Q(internal_reference__icontains=q)
- | Q(external_id__icontains=q)
- | Q(name__icontains=q)
+ Q(internal_reference__icontains=q)
+ | Q(external_id__icontains=q)
+ | Q(name__icontains=q)
)
try:
int(q)
@@ -202,10 +202,10 @@ def show_find_extra(request, find):
user = request.user.ishtaruser
q = (
models.FindBasket.objects.filter(items__pk=find.pk)
- .filter(
+ .filter(
Q(user=user) | Q(shared_with__pk=user.pk) | Q(shared_write_with__pk=user.pk)
)
- .distinct()
+ .distinct()
)
return {"baskets": [(basket.pk, basket.full_label) for basket in q.all()]}
@@ -509,8 +509,8 @@ class OwnBasket(object):
models.FindBasket.objects.filter(
Q(user=user) | Q(shared_with=user) | Q(shared_write_with=user)
)
- .distinct()
- .get(pk=pk)
+ .distinct()
+ .get(pk=pk)
)
except models.FindBasket.DoesNotExist:
raise PermissionDenied
@@ -607,9 +607,9 @@ class FindBasketDeleteItemView(
basket = self.get_basket(user=ishtaruser, pk=self.kwargs["basket"])
if (
- not user.is_superuser
- and not ishtaruser.has_right("view_find")
- and not (ishtaruser.has_right("view_own_find") and find.is_own(user))
+ not user.is_superuser
+ and not ishtaruser.has_right("view_find")
+ and not (ishtaruser.has_right("view_own_find") and find.is_own(user))
):
raise PermissionDenied
basket.items.remove(find)
@@ -685,7 +685,7 @@ treatment_modification_wizard = wizards.TreatmentModificationWizard.as_view(
def treatment_modify(request, pk):
if not wizard_is_available(
- treatment_modification_wizard, request, models.Treatment, pk
+ treatment_modification_wizard, request, models.Treatment, pk
):
return HttpResponseRedirect("/")
wizards.TreatmentModificationWizard.session_set_value(
@@ -853,7 +853,7 @@ treatment_deletion_wizard = wizards.TreatmentDeletionWizard.as_view(
def treatment_delete(request, pk):
if not wizard_is_available(
- treatment_deletion_wizard, request, models.Treatment, pk
+ treatment_deletion_wizard, request, models.Treatment, pk
):
return HttpResponseRedirect("/")
wizards.TreatmentDeletionWizard.session_set_value(
@@ -909,7 +909,7 @@ treatment_administrativeact_modification_wizard = (
def treatment_administrativeacttreatment_modify(request, pk):
if not wizard_is_available(
- treatment_administrativeact_modification_wizard, request, AdministrativeAct, pk
+ treatment_administrativeact_modification_wizard, request, AdministrativeAct, pk
):
return HttpResponseRedirect("/")
wizards.TreatmentEditAdministrativeActWizard.session_set_value(
@@ -938,7 +938,7 @@ treatment_admacttreatment_deletion_wizard = AdministrativeActDeletionWizard.as_v
def treatment_administrativeacttreatment_delete(request, pk):
if not wizard_is_available(
- treatment_admacttreatment_deletion_wizard, request, AdministrativeAct, pk
+ treatment_admacttreatment_deletion_wizard, request, AdministrativeAct, pk
):
return HttpResponseRedirect("/")
wizard_url = "treatment_admacttreatment_deletion"
@@ -998,7 +998,7 @@ treatmentfile_modification_wizard = wizards.TreatmentFileModificationWizard.as_v
def treatmentfile_modify(request, pk):
if not wizard_is_available(
- treatmentfile_modification_wizard, request, models.TreatmentFile, pk
+ treatmentfile_modification_wizard, request, models.TreatmentFile, pk
):
return HttpResponseRedirect("/")
wizards.TreatmentFileModificationWizard.session_set_value(
@@ -1041,7 +1041,7 @@ treatmentfile_deletion_wizard = wizards.TreatmentFileDeletionWizard.as_view(
def treatmentfile_delete(request, pk):
if not wizard_is_available(
- treatmentfile_deletion_wizard, request, models.TreatmentFile, pk
+ treatmentfile_deletion_wizard, request, models.TreatmentFile, pk
):
return HttpResponseRedirect("/")
wizard_url = "treatmentfile_deletion"
@@ -1098,10 +1098,10 @@ treatmentfile_admacttreatmentfile_modification_wizard = (
def treatmentfile_administrativeacttreatmentfile_modify(request, pk):
if not wizard_is_available(
- treatmentfile_admacttreatmentfile_modification_wizard,
- request,
- AdministrativeAct,
- pk,
+ treatmentfile_admacttreatmentfile_modification_wizard,
+ request,
+ AdministrativeAct,
+ pk,
):
return HttpResponseRedirect("/")
wizards.TreatmentFileEditAdministrativeActWizard.session_set_value(
@@ -1157,10 +1157,10 @@ treatmentfile_admacttreatmentfile_deletion_wizard = (
def treatmentfile_administrativeacttreatmentfile_delete(request, pk):
if not wizard_is_available(
- treatmentfile_admacttreatmentfile_deletion_wizard,
- request,
- AdministrativeAct,
- pk,
+ treatmentfile_admacttreatmentfile_deletion_wizard,
+ request,
+ AdministrativeAct,
+ pk,
):
return HttpResponseRedirect("/")
wizard_url = "treatmentfle_admacttreatmentfle_deletion"
@@ -1172,30 +1172,30 @@ def treatmentfile_administrativeacttreatmentfile_delete(request, pk):
def reset_wizards(request):
for wizard_class, url_name in (
- (wizards.FindWizard, "find_creation"),
- (wizards.FindModificationWizard, "find_modification"),
- (wizards.FindDeletionWizard, "find_deletion"),
- (wizards.TreatmentWizard, "treatement_creation"),
- (wizards.TreatmentModificationWizard, "treatment_modification"),
- (wizards.TreatmentDeletionWizard, "treatment_deletion"),
- (wizards.TreatmentAdministrativeActWizard, "treatment_admacttreatment"),
- (
- wizards.TreatmentEditAdministrativeActWizard,
- "treatment_admacttreatment_modification",
- ),
- (wizards.TreatmentDeletionWizard, "treatment_admacttreatment_deletion"),
- (wizards.TreatmentFileWizard, "treatmentfile_creation"),
- (wizards.TreatmentFileModificationWizard, "treatmentfile_modification"),
- (wizards.TreatmentFileDeletionWizard, "treatmentfile_deletion"),
- (
- wizards.TreatmentFileAdministrativeActWizard,
- "treatmentfle_admacttreatmentfle",
- ),
- (
- wizards.TreatmentFileEditAdministrativeActWizard,
- "treatmentfle_admacttreatmentfle_modification",
- ),
- (AdministrativeActDeletionWizard, "treatmentfle_admacttreatmentfle_deletion"),
+ (wizards.FindWizard, "find_creation"),
+ (wizards.FindModificationWizard, "find_modification"),
+ (wizards.FindDeletionWizard, "find_deletion"),
+ (wizards.TreatmentWizard, "treatement_creation"),
+ (wizards.TreatmentModificationWizard, "treatment_modification"),
+ (wizards.TreatmentDeletionWizard, "treatment_deletion"),
+ (wizards.TreatmentAdministrativeActWizard, "treatment_admacttreatment"),
+ (
+ wizards.TreatmentEditAdministrativeActWizard,
+ "treatment_admacttreatment_modification",
+ ),
+ (wizards.TreatmentDeletionWizard, "treatment_admacttreatment_deletion"),
+ (wizards.TreatmentFileWizard, "treatmentfile_creation"),
+ (wizards.TreatmentFileModificationWizard, "treatmentfile_modification"),
+ (wizards.TreatmentFileDeletionWizard, "treatmentfile_deletion"),
+ (
+ wizards.TreatmentFileAdministrativeActWizard,
+ "treatmentfle_admacttreatmentfle",
+ ),
+ (
+ wizards.TreatmentFileEditAdministrativeActWizard,
+ "treatmentfle_admacttreatmentfle_modification",
+ ),
+ (AdministrativeActDeletionWizard, "treatmentfle_admacttreatmentfle_deletion"),
):
wizard_class.session_reset(request, url_name)
@@ -1320,8 +1320,8 @@ class PublicFindAPI(APIView):
return empty
q = (
models.FindBasket.items.through.objects.filter(findbasket_id=basket.id)
- .values("find_id")
- .order_by("id")
+ .values("find_id")
+ .order_by("id")
)
id_list = [bi["find_id"] for bi in q]
clauses = " ".join(
@@ -1343,4 +1343,4 @@ def get_geo_items(request, pk, get_polygons, current_right=None):
if not base_find:
return Http404()
dic = base_find.get_geo_items(get_polygons=(get_polygons == "True"))
- return HttpResponse(json.dumps(dic).encode('utf-8'))
+ return HttpResponse(json.dumps(dic).encode("utf-8"))