Merge pull request #3404 from dzhw/tvillwock/issue3380-doi-fix

Replaced data package DOI with DMR attachment DOI
dzhw · Jan 20, 2025 · d003602 · d003602
2 parents 00824d5 + aca1ab6
commit d003602
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mdm-frontend/src/app/legacy/ordermanagement/services/citationHintGenerator.service.js b/mdm-frontend/src/app/legacy/ordermanagement/services/citationHintGenerator.service.js
@@ -74,14 +74,14 @@ function($interpolate, LanguageService, $filter, $rootScope) {
       });
   };
 
-  var generateBibtexForAttachment = function(attachment, dataPackage) {
+  var generateBibtexForAttachment = function(attachment) {
     if ($rootScope.bowser.msie) {
       throw 'citation.js is not compatible with IE11';
     }
     var citeJson = {
       title: attachment.title,
       type: 'report',
-      DOI: dataPackage.doi,
+      DOI: attachment.doi,
       publisher: attachment.citationDetails.institution,
       'publisher-place': attachment.citationDetails.location,
       issued: [{'date-parts': [attachment.citationDetails.publicationYear]}],
@@ -123,15 +123,15 @@ function($interpolate, LanguageService, $filter, $rootScope) {
     };
   };
 
-  var generateCitationHintForAttachment = function(attachment, dataPackage) {
+  var generateCitationHintForAttachment = function(attachment) {
     var citationHint =
       '{{attachment.citationDetails.authors | displayPersons}} ' +
       '({{attachment.citationDetails.publicationYear}}). ' +
       '{{attachment.title}}. ' +
       '{{attachment.citationDetails.location}}: ' +
       '{{attachment.citationDetails.institution}}.';
-    if (!!dataPackage.doi) {
-      citationHint += ' https://doi.org/{{dataPackage.doi}}';
+    if (attachment.doi) {
+      citationHint += ' ' + attachment.doi;
     }
     return $interpolate(citationHint)({attachment: attachment, dataPackage: dataPackage});
   };

diff --git a/mdm-frontend/src/app/legacy/ordermanagement/views/data-package-citation-dialog.controller.js b/mdm-frontend/src/app/legacy/ordermanagement/views/data-package-citation-dialog.controller.js
@@ -38,10 +38,10 @@ angular.module('metadatamanagementApp')
         ctrl.methodReportsCitationHint = {
           de: germanMethodReports.length > 0 ?
             CitationHintGeneratorService.generateCitationHintForAttachment(
-              germanMethodReports[0], dataPackage) : null,
+              germanMethodReports[0]) : null,
           en: englishMethodReports.length > 0 ?
             CitationHintGeneratorService.generateCitationHintForAttachment(
-              englishMethodReports[0], dataPackage) : null,
+              englishMethodReports[0]) : null,
         };
         ctrl.methodReports = {
           de: germanMethodReports.length > 0 ? germanMethodReports[0] : null,
@@ -74,7 +74,7 @@ angular.module('metadatamanagementApp')
       }
       if (methodReport) {
         ctrl.saveBibtex(CitationHintGeneratorService
-          .generateBibtexForAttachment(methodReport, dataPackage));
+          .generateBibtexForAttachment(methodReport));
       }
     };