Skip to content

Commit

Permalink
Merge pull request #56 from arthur-schnitzler/main
Browse files Browse the repository at this point in the history
updates
  • Loading branch information
csae8092 authored Jan 27, 2024
2 parents 3906158 + f4de7f2 commit 66d75ec
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions apis_core/apis_metainfo/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def merge_with(self, entities):
if not isinstance(entities, list) and not isinstance(entities, QuerySet):
entities = [entities]
entities = [
self_model_class.objects.get(pk=ent) if type(ent) == int else ent
self_model_class.objects.get(pk=ent) if type(ent) == int else ent # noqa: E721
for ent in entities
]
rels = ContentType.objects.filter(
Expand Down Expand Up @@ -304,7 +304,7 @@ def merge_with(self, entities):
for u in Uri.objects.filter(entity=ent):
u.entity = self
u.save()
for l in Label.objects.filter(temp_entity=ent):
for l in Label.objects.filter(temp_entity=ent): # noqa: E741
l.temp_entity = self
l.save()
for r in rels.filter(model__icontains=e_b):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
title="Verbindung löschen"
hx-get="/apis/relations/delete/{{ record.pk }}/"
hx-target="closest tr" hx-swap="outerHTML swap:1s"
hx-confirm="Sicher? Weil was weg ist ist weg"
hx-confirm="Sicher? Weil was weg ist, ist weg"
>
<i class="bi bi-trash"></i>
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class="btn"
hx-trigger="click"
hx-post="/apis/labels/delete-from-tabel/{{ record.pk }}/"
hx-confirm="Sicher? Weil was weg ist ist weg"
hx-confirm="Sicher? Weil was weg ist, ist weg"
hx-target="closest tr" hx-swap="outerHTML swap:1s"
>
<i class="bi bi bi-trash" title="Label: '{{ record }}' löschen"> </i>
Expand Down
6 changes: 6 additions & 0 deletions apis_core/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from apis_core.apis_metainfo.views import beacon
from apis_core.apis_vocabularies.api_views import UserViewSet
from apis_core.helper_functions.ContentType import GetContentTypes
from apis_core.apis_entities.autocomplete3 import GenericEntitiesAutocomplete

app_name = "apis_core"

Expand Down Expand Up @@ -37,6 +38,11 @@
else:
urlpatterns = [
path("api/", include((router.urls, "apis_core"), namespace="apis_api")),
path(
"api/entities/autocomplete-network/<entity>/",
GenericEntitiesAutocomplete.as_view(),
name="network-ac",
),
path("beacon/", beacon, name="beacon"),
path("labels/", include("apis_core.apis_labels.urls", namespace="apis_labels")),
path("tei/", include("apis_core.apis_tei.tei_urls", namespace="apis_tei")),
Expand Down

0 comments on commit 66d75ec

Please sign in to comment.