Skip to content

Commit 4b7e1a3

Browse files
committed
Merge remote-tracking branch 'origin/release/6.2.3' into release/6.2.3
2 parents 49464f4 + 23f9136 commit 4b7e1a3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ export abstract class AbstractFileFieldComponent extends AbstractDataFieldCompon
167167
}
168168
}
169169
this.updatedFieldSubscription = this.dataField.updated.subscribe(() => {
170+
this.previewSource = undefined;
170171
if (!!this.filePreview
171172
&& !!this.dataField.value
172173
&& !!this.dataField.value.name) {

projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-divider-field/i18n-divider-field.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<div fxFlex="20" class="divider-line"
33
[ngClass]="{'divider-line-lgbt': isDividerLGBTQ(), 'primary-background-color': !dividerPropertyEnabled('dividerColor')}"
44
[ngStyle]="dividerPropertyEnabled('dividerColor') && {'background': getDividerColor()}"></div>
5-
<span [ngClass]="{'margin-default': dividerI18nField.value.defaultValue !== ''}"
5+
<span *ngIf='!!dividerI18nField.value' [ngClass]="{'margin-default': dividerI18nField.value?.defaultValue !== ''}"
66
[ngStyle]="dividerPropertyEnabled('fontSize') && {'font-size': getDividerFontSize()}">
7-
{{dividerI18nField.value.defaultValue}}
7+
{{dividerI18nField.value?.defaultValue ?? ''}}
88
</span>
99
<div fxFlex class="divider-line"
1010
[ngClass]="{'divider-line-lgbt': isDividerLGBTQ(), 'primary-background-color': !dividerPropertyEnabled('dividerColor')}"

0 commit comments

Comments
 (0)