Merge remote-tracking branch 'origin/rc' into dev

Author: DavidBlaa

.github/workflows/codeql.yml

@@ -13,10 +13,12 @@ name: "CodeQL Advanced"
 
 on:
   push:
-    branches: 
+    branches:
+      - master
       - rc
   pull_request:
     branches: 
+      - master
       - rc
   schedule:
     - cron: '38 14 * * 4'

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Controllers/DataController.cs

@@ -469,7 +469,10 @@ public async Task<ActionResult> GetCitationOrTitle(long Id, long datasetVersionI
                     var citationSettings = settingsHelper.GetCitationSettings();
 
                     var errors = new List<string>();
-                    if (citationSettings == null || !citationSettings.ShowCitation || !MappingUtils.IsMapped(datasetVersion.Dataset.MetadataStructure.Id, LinkElementType.MetadataStructure, conceptManager.FindByName("citation").Id, LinkElementType.MappingConcept, out errors))
+                    string conceptName = "Citation_" + citationSettings.ReadCitationFormat;
+                    var concept = conceptManager.FindByName(conceptName);
+
+                    if (citationSettings == null || !citationSettings.ShowCitation || concept == null || !MappingUtils.IsMapped(datasetVersion.Dataset.MetadataStructure.Id, LinkElementType.MetadataStructure, concept.Id, LinkElementType.MappingConcept, out errors))
                     {
                         return PartialView("_Title", datasetVersion.Title);
                     }