diff --git a/dbrepo-ui-new/app/records_ui/__init__.py b/dbrepo-ui-new/app/records_ui/__init__.py index e5dcd2027fd3e7f4b81678d2300ae68e04a28101..0d5d945aace6806998033701358e93a374e9bf2f 100644 --- a/dbrepo-ui-new/app/records_ui/__init__.py +++ b/dbrepo-ui-new/app/records_ui/__init__.py @@ -16,10 +16,10 @@ def show_record(db_id): database = repo.get_database(database_id=db_id) view = repo.get_view(database_id=db_id, view_id=database.views[0].id) view_data = repo.get_view_data(database_id=db_id, view_id=database.views[0].id).to_dict(orient='records') - #queries = repo.get_queries(database_id=db_id) + queries = repo.get_queries(database_id=db_id) print(view_data) return render_template('records/detail.html', database=database, view=view, data=view_data, - doi_id=0, queries=database.subsets) + doi_id=0, queries=queries) @records_bp.route('/view/<database_id>/<view_id>') 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 bb5a49f0d1aab14d1675210a24d6f99bda12d587..fe23673993475b42a3b98bcd458864e65e742dff 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 @@ -45,7 +45,7 @@ <tbody> {% for subset in subsets %} <tr> - <td>{{ subset.titles[0].title }}</td> + <td>{{ subset.identifiers[0].titles[0].title }}</td> <td> <span> <a role="button" class="ui compact mini button right floated"> @@ -54,7 +54,7 @@ <a role="button" class="ui compact mini button preview-link right floated" href="/view/{{ 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.titles[0] }}"> + <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 }}"> <i class="eye icon" aria-hidden="true"></i>Preview </a>