Skip to content

Commit

Permalink
Merge pull request #10 from acdh-oeaw/bugfix/edit-delete
Browse files Browse the repository at this point in the history
Bugfix/edit delete
  • Loading branch information
gythaogg committed Jan 22, 2024
2 parents 0f98f06 + 62cfc9f commit ccc0374
Show file tree
Hide file tree
Showing 5 changed files with 226 additions and 6 deletions.
8 changes: 8 additions & 0 deletions apis_ontology/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,14 @@ class TibScholRelation(models.Model):
"end_date_written",
]

@property
def subject_type(self):
return str(self.subj_model.__name__).lower()

@property
def object_type(self):
return str(self.obj_model.__name__).lower()

class Meta:
abstract = True

Expand Down
8 changes: 4 additions & 4 deletions apis_ontology/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ class CustomRelationTableEdit(RelationTable):

id = tables.TemplateColumn("{{ record.id }}")
subject = tables.TemplateColumn(
"<a href='/entities/entity/{{ record.subj_model }}/{{ record.subj.pk }}'>{{record.subj}} ({{record.subj.pk}})</a>"
"<a href='/apis/entities/entity/{{ record.subject_type }}/{{ record.subj.pk }}/detail'>{{record.subj}} ({{record.subj.pk}})</a>"
)
object = tables.TemplateColumn(
"<a href='/entities/entity/{{ record.obj_model }}/{{ record.obj.pk }}'>{{record.obj}} ({{record.obj.pk}})</a>"
"<a href='/apis/entities/entity/{{ record.object_type }}/{{ record.obj.pk }}/detail'>{{record.obj}} ({{record.obj.pk}})</a>"
)
description = tables.TemplateColumn("{{ record.name }}")
edit = tables.TemplateColumn(
Expand Down Expand Up @@ -42,10 +42,10 @@ class CustomRelationTableView(RelationTable):

id = tables.TemplateColumn("{{ record.id }}")
subject = tables.TemplateColumn(
"<a href='/entities/entity/{{ record.subj_model }}/{{ record.subj.pk }}'>{{record.subj}} ({{record.subj.pk}})</a>"
"<a href='/apis/entities/entity/{{ record.subject_type }}/{{ record.subj.pk }}/detail'>{{record.subj}} ({{record.subj.pk}})</a>"
)
object = tables.TemplateColumn(
"<a href='/entities/entity/{{ record.obj_model }}/{{ record.obj.pk }}'>{{record.obj}} ({{record.obj.pk}})</a>"
"<a href='/apis/entities/entity/{{ record.object_type }}/{{ record.obj.pk }}/detail'>{{record.obj}} ({{record.obj.pk}})</a>"
)
description = tables.TemplateColumn("{{ record.name }}")
confidence = tables.TemplateColumn("{{ record.confidence }}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

{% block scriptHeader %}
{{ block.super }}
<script src="https://unpkg.com/htmx.org@latest/dist/htmx.js"></script>
{% if tei %}
<link rel="stylesheet"
href="{{ ceteicean_css }}"
Expand Down
1 change: 0 additions & 1 deletion apis_ontology/templates/apis_entities/edit_generic.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

{% block scriptHeader %}
{{ block.super }}
<script src="https://unpkg.com/htmx.org@latest/dist/htmx.js"></script>
{% load relations %}
{% load custom_relations %}

Expand Down
214 changes: 214 additions & 0 deletions apis_ontology/templates/base.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
<!DOCTYPE html>
{% load static %}
{% load apis_metainfo_extras %}
<html lang="en">

<head>
<meta charset="utf-8">
<title>

{% block title %}Title Placeholder{% endblock %}

</title>
<meta name="viewport" content="width=device-width, initial-scale=1">

{% block metaDescription %}
<meta name="description" content="Description">
<meta name="author" content="Author">
{% endblock %}

<!-- Start favicons -->
<link rel="apple-touch-icon" sizes="180x180" href="{{ SHARED_URL }}favicon/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="{{ SHARED_URL }}favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="{{ SHARED_URL }}favicon/favicon-16x16.png" />
<link rel="manifest" href="{{ SHARED_URL }}favicon/manifest.json" />
<link rel="mask-icon" href="{{ SHARED_URL }}favicon/safari-pinned-tab.svg" color="#00aba9" />

{% block styles %}
{% include "partials/bootstrap4_css.html" %}
{% endblock styles %}

<link rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.1/css/bootstrap-select.min.css" />
<meta name="theme-color" content="#ffffff" />
<!-- End favicons -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
{% include "apis_entities/apis_templatetag.html" %}
<link href="https://fonts.googleapis.com/css?family=Libre+Franklin:400,500" rel="stylesheet" />
<link rel="stylesheet" href="{{ PROJECT_CSS }}?rnd=1" rel="stylesheet" />
<link rel="stylesheet" href="{{ SHARED_URL }}apis/libraries/scroll-to-top/css/ap-scroll-top.min.css" />
<script src="https://unpkg.com/htmx.org@1.9.10"></script>

{% block scriptHeader %}{% endblock %}

</head>

<body role="document" class="home contained fixed-nav" id="body" style="height: unset!important"
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'>
<div class="hfeed site" id="page">
<div class="wrapper-fluid wrapper-navbar sticky-navbar" id="wrapper-navbar" itemscope=""
itemtype="http://schema.org/WebSite">
<a class="skip-link screen-reader-text sr-only" href="#content">Skip to content</a>
<!-- Start site navigation -->
<nav class="navbar navbar-expand-lg navbar-light">
<div class="container-fluid">
<!-- Start custom branding -->
<a href="/" class="navbar-brand custom-logo-link" rel="home" itemprop="url">
<img src="{{ PROJECT_LOGO }}" class="img-fluid" style="height: 36px;" />
</a>
<!-- End custom branding -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon" />
</button>
<!-- Start main menu -->
<div class="collapse navbar-collapse justify-content-end" id="navbarNavDropdown">
<ul id="main-menu" class="navbar-nav mr-auto">

{% block main-menu %}
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false">
Entities
<span class="caret" />
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
{% for ent in entities_links %}
<a class="dropdown-item"
href="{% url 'apis:apis_entities:generic_entities_list' ent.0 %}">
{{ ent.1}}
</a>
{% endfor %}
<a class="dropdown-item" href="{% url 'apis:apis_metainfo:uri_browse' %}">URIs</a>
</div>
</li>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false">Relations
<span class="caret" />
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
{% for ent in relations_list %}
<a class="dropdown-item"
href="{% url 'apis:apis_relations:generic_relations_list' ent %}">
{{ ent|title}}</a>
{% endfor %}
</div>
</li>
{% endblock main-menu %}

{% block main-menu-extra %}
{% endblock main-menu-extra %}

</ul>

{% block userlogin-menu %}
<!-- Start user login submenu -->
<ul class="navbar-nav">

{% if user.is_authenticated %}
<li class="nav-item dropdown ml-auto">
<a href="" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false">User: {{ user.get_username }}</a>
<div class="dropdown-menu dropdown-menu-right">
<div class="dropdown-item">
<a class="nav-link p-0" href="{% url 'admin:logout' %}">
<span class="feather-32" data-feather="log-out"></span>
log out
</a>
</div>
</div>
</li>
{% else %}
<li class="nav-item dropdown ml-auto">
<a class="nav-link p-0"
href="{% url 'admin:login' %}?next={{ request.path|urlencode }}">
<span class="feather-32" data-feather="log-in"></span>
</a>
</li>
{% endif %}

</ul>
<!-- End user login submenu -->
{% endblock userlogin-menu %}

</div>
<!-- End main menu -->
</div>
</nav>
<!-- End site navigation -->
</div>
<!-- Start main content block -->
<div id="content">

{% if DEV_VERSION %}
<div class="alert alert-danger" role="alert">
This is a DEVELOPMENT instance. Click <a href="https://{{ PROJECT_NAME }}.acdh.oeaw.ac.at">here</a> for
the
Production version
</div>
{% endif %}

{% block content %}{% endblock %}

</div>
<!-- End main content block -->
<div class="d-flex footer-separator justify-content-center p-2"></div>
<!-- Start site footer -->
<div id="wrapper-footer-full" class="fundament-default-footer">
<div class="d-flex flex-column container-fluid p-4" id="footer-full-content" tabindex="-1">
<div class="d-flex flex-column align-self-center justify-content-center">
<div class="d-flex flex-column">
<div class="align-self-center p-1">
<a href="https://www.oeaw.ac.at/acdh/">
<img class="w-75" alt="ACDH website"
src="https://fundament.acdh.oeaw.ac.at/common-assets/images/acdh_logo.svg" />
</a>
</div>
<div class="align-self-center w-50 p-1 text-center">
Austrian Centre for Digital Humanities (ACDH) of the Austrian Academy of Sciences
</div>
</div>
</div>
</div>
</div>
<!-- Start imprint, project partners -->
<div id="wrapper-footer-secondary" class="footer-imprint-bar p-2 text-center">
<a href="/imprint.html">Imprint | Impressum</a>

{% if user.is_authenticated %}
{% if DB_NAME %}
<div class="footer-imprint-bar">
<div>{{ DB_NAME }}</div>
</div>
{% endif %}
{% endif %}

</div>
<!-- End imprint, project partners -->
<!-- End site footer -->
</div>

{% block scripts %}
{% include "partials/feather_js.html" %}
{% include "partials/bootstrap4_js.html" %}
<script type="text/javascript"
src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.1/js/bootstrap-select.min.js"></script>
<script src="{{ SHARED_URL }}apis/libraries/scroll-to-top/js/ap-scroll-top.min.js"></script>
{% endblock %}

{% block scripts2 %}
{% endblock scripts2 %}

{% block modal %}
<!-- Modal -->
<div class="modal fade" id="modal" tabindex="-1" aria-labelledby="modalLabel" aria-hidden="true">
<div class="modal-dialog" style="max-width: 800px;">
<div id="modal-here" class="modal-content"></div>
</div>
</div>
{% endblock modal %}

</body>

</html>

0 comments on commit ccc0374

Please sign in to comment.