Skip to content
Snippets Groups Projects
Verified Commit f1873d2a authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'dev' of gitlab.phaidra.org:fair-data-austria-db-repository/fda-services into dev

parents d70bef35 fd7cd223
No related branches found
No related tags found
4 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted
...@@ -19,12 +19,8 @@ author: Martin Weise ...@@ -19,12 +19,8 @@ author: Martin Weise
#### Changes #### Changes
<<<<<<< Updated upstream
* Remove the Data Database Sidecar and replace it with Apache Spark 4.
=======
* Remove the Data Database Sidecar and replace it with Apache Spark * Remove the Data Database Sidecar and replace it with Apache Spark
in [#458](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/458). in [#458](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/458).
>>>>>>> Stashed changes
* Allow anonymous users to create subsets for public databases * Allow anonymous users to create subsets for public databases
in [#449](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/449). in [#449](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/449).
* Show file upload progress * Show file upload progress
......
...@@ -288,7 +288,7 @@ export const useIdentifierService = (): any => { ...@@ -288,7 +288,7 @@ export const useIdentifierService = (): any => {
if (!data) { if (!data) {
return null return null
} }
return data.doi !== null ? 'DOI' : 'URI' return data.doi ? 'DOI' : 'URI'
} }
function creatorToCreatorJsonLd(creator: CreatorDto) { function creatorToCreatorJsonLd(creator: CreatorDto) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment