From c332090eb8f5d7dfb0df2fd2d46937c3a6a50a18 Mon Sep 17 00:00:00 2001
From: Luca <BrucknerLu@gmail.com>
Date: Thu, 8 May 2025 12:02:50 +0200
Subject: [PATCH] subset detail page now loads correctly
---
dbrepo-ui-new/app/records_ui/__init__.py | 4 ++--
dbrepo-ui-new/app/records_ui/static/style.css | 2 +-
.../templates/records/macros/data.html | 2 +-
.../templates/view_records/detail.html | 19 +++++++++++++++----
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/dbrepo-ui-new/app/records_ui/__init__.py b/dbrepo-ui-new/app/records_ui/__init__.py
index 0d5d945aac..77e62268e7 100644
--- a/dbrepo-ui-new/app/records_ui/__init__.py
+++ b/dbrepo-ui-new/app/records_ui/__init__.py
@@ -30,7 +30,7 @@ def show_view_record(database_id, view_id):
return render_template('view_records/detail.html', database=database, metadata=view,
- data=view_data, table_id=0)
+ data=view_data, type="view")
@records_bp.route('/subset/<database_id>/<subset_id>')
def show_subset_record(database_id, subset_id):
@@ -40,7 +40,7 @@ def show_subset_record(database_id, subset_id):
return render_template('view_records/detail.html', database=database, metadata=subset,
- data=subset_data, table_id=0)
+ data=subset_data, type="subset")
@records_bp.route('/get-data', methods=['GET'])
diff --git a/dbrepo-ui-new/app/records_ui/static/style.css b/dbrepo-ui-new/app/records_ui/static/style.css
index dfce68929f..d8304f838d 100644
--- a/dbrepo-ui-new/app/records_ui/static/style.css
+++ b/dbrepo-ui-new/app/records_ui/static/style.css
@@ -105,7 +105,7 @@ p {
}
#type {
- width:10%;
+ width:13%;
border-radius: 5px;
background-color: #767676;
text-align: center;
diff --git a/dbrepo-ui-new/app/records_ui/templates/records/macros/data.html b/dbrepo-ui-new/app/records_ui/templates/records/macros/data.html
index fe23673993..7a59c7ae55 100644
--- a/dbrepo-ui-new/app/records_ui/templates/records/macros/data.html
+++ b/dbrepo-ui-new/app/records_ui/templates/records/macros/data.html
@@ -51,7 +51,7 @@
<a role="button" class="ui compact mini button right floated">
<i class="download icon" aria-hidden="true"></i>Download
</a>
- <a role="button" class="ui compact mini button preview-link right floated" href="/view/{{ subset.database_id }}/{{ subset.id }}">
+ <a role="button" class="ui compact mini button preview-link right floated" href="/subset/{{ subset.database_id }}/{{ subset.id }}">
<i class="info icon" aria-hidden="true"></i>Details
</a>
<a role="button" class="ui compact mini button preview-link right floated subset_preview_button" data-value="{{ subset.id }}" data-database_id="{{ subset.database_id }}" data-name="{{ subset.identifiers[0].titles[0].title }}">
diff --git a/dbrepo-ui-new/app/records_ui/templates/view_records/detail.html b/dbrepo-ui-new/app/records_ui/templates/view_records/detail.html
index 343cc28aaf..a9eea910de 100644
--- a/dbrepo-ui-new/app/records_ui/templates/view_records/detail.html
+++ b/dbrepo-ui-new/app/records_ui/templates/view_records/detail.html
@@ -13,17 +13,28 @@
<div id="view-header">
{# Created {{ view.created }}#}
- <div class="view-header-child" id="type">View</div>
+ {% if type == "view" %}
+ <div class="view-header-child" id="type">Data Source</div>
+ {% else %}
+ <div class="view-header-child" id="type">Data Set</div>
+ {% endif %}
+
<div class="view-header-child" id="access"><i class="lock open icon"></i>Open</div>
</div>
- <h1>{{ metadata.name }}</h1>
- <a id="creator">{{ metadata.owner.username }}</a>
+ {% if type == "view" %}
+ <h1>{{ metadata.name }}</h1>
+ {% else %}
+ <h1>{{ metadata.identifiers[0].titles[0].title }}</h1>
+ {% endif %}
+ <a id="creator">{{ creators_list(database.identifiers[0].creators)}}</a>
<p style="white-space: pre-line;">{{ metadata.description }}</p>
<h2>Data</h2>
{{ preview_info_box(data) }}
- {{ view_schema_box(metadata) }}
+ {% if type == "view" %}
+ {{ view_schema_box(metadata) }}
+ {% endif %}
</div>
<div class="right-section">
{%- include "/view_records/details/side_bar.html" %}
--
GitLab