Skip to content

Commit 5608f94

Browse files
authored
Merge branch 'release/6.2.5' into NAE-1758
2 parents 17a2f96 + 40b5f93 commit 5608f94

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export abstract class AbstractCurrencyNumberFieldComponent extends AbstractNumbe
2323
this.fieldType = this.TEXT_TYPE;
2424
this.transformedValue = this.transformCurrency(this.numberField.value?.toString());
2525
this.numberField.valueChanges().subscribe(value => {
26-
if (value !== undefined) {
26+
if (value !== undefined && value !== null) {
2727
if (this.fieldType === this.TEXT_TYPE) {
2828
this.transformedValue = this.transformCurrency(value.toString()) + this.WHITESPACE;
2929
}

projects/netgrif-components/nae-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
margin-bottom: 16px !important;
3939
}
4040

41-
.mat-form-field .mat-form-field-prefix {
41+
nc-number-currency-field .mat-form-field .mat-form-field-prefix {
4242
position: initial !important;
4343
padding-right: 4px !important;
4444
}

projects/netgrif-components/src/lib/panel/task-panel/task-panel.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
<div class="task-panel-body" [ngClass]="{'paper-view': isPaperView()}" fxFlex="100">
5656
<ng-template [cdkPortalOutlet]="portal"></ng-template>
5757
</div>
58-
<mat-action-row [ngStyle]="{'justify-content': actionRowJustifyContent ?? 'flex-end' }">
58+
<mat-action-row fxLayout.lt-sm="column" [ngStyle]="{'justify-content': actionRowJustifyContent ?? 'flex-end' }">
5959
<mat-spinner class='action-row-spinner' *ngIf="isLoading && hidePanelHeader"
6060
[diameter]="20"></mat-spinner>
61-
<div fxLayout.lt-sm="column" fxLayoutAlign.lt-sm="center stretch" ngClass.lt-sm="width-100"
61+
<div fxLayoutAlign.lt-sm="center stretch" ngClass.lt-sm="width-100"
6262
*ngFor='let button of (!!actionButtonTemplates && actionButtonTemplates.length > 0 ?
6363
actionButtonTemplates : [assignButton, delegateButton, reassignButton, cancelButton, finishButton, collapseButton])'>
6464
<ng-container *ngTemplateOutlet='button; context:thisContext'></ng-container>

0 commit comments

Comments
 (0)