Merge branch '3.3.x'

dainst · Nov 8, 2023 · 539a11f · 539a11f
2 parents c8c28f1 + 78be2f6
commit 539a11f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/desktop/src/app/components/import/parser/convert-field-types.ts b/desktop/src/app/components/import/parser/convert-field-types.ts
@@ -134,6 +134,7 @@ function convertComposite(resource: Resource, fieldName: string, field: Field) {
 
 function convertCheckboxes(container: any, fieldName: string) {
 
+    if (!container[fieldName]) return;
     container[fieldName] = container[fieldName].split(';');
 }
 

diff --git a/desktop/src/app/components/widgets/document-info/fields-view/default-field-view.html b/desktop/src/app/components/widgets/document-info/fields-view/default-field-view.html
@@ -4,9 +4,9 @@
 </div>
 <div *ngIf="isArray(value)">
     <ul>
-        <li *ngFor="let label of getObjectLabels(value)" class="field-value">
-            {{label}}
-        </li>
+        <li *ngFor="let label of getObjectLabels(value)"
+            class="field-value" 
+            [innerHTML]="label"></li>
     </ul>
 </div>
 <div *ngIf="!isBoolean(value) && !isArray(value)"
-Original file line number
+Diff line change
@@ Expand Up @@
     function convertCheckboxes(container: any, fieldName: string) {
+        if (!container[fieldName]) return;
         container[fieldName] = container[fieldName].split(';');
     }
@@ Expand Down @@