Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-9527' into 'master'

Browse Source 
RED-9527: fixed enter not saving the file attribute.

See merge request redactmanager/red-ui!495
This commit is contained in:
Dan Percic 2024-07-03 16:00:04 +02:00
commit 2eb5d81e74
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.html
View File

@ -40,7 +40,7 @@
[ngClass]="{
'workflow-edit-button': mode === 'workflow',
'action-buttons edit-button': !fileNameColumn,
'filename-edit-button': fileNameColumn
'filename-edit-button': fileNameColumn,
}"
>
<div [ngClass]="{ 'workflow-edit-icon': mode === 'workflow', 'edit-icon': !fileNameColumn }">
@ -56,12 +56,13 @@
class="edit-input"
iqserStopPropagation
>
<form (ngSubmit)="form.valid && save()" [formGroup]="form">
<form [formGroup]="form">
<iqser-dynamic-input
(closedDatepicker)="closedDatepicker = $event"
(keyup.enter)="form.valid && save()"
(keydown.escape)="close()"
[style.max-width]="editFieldWidth"
[style.min-width]="editFieldWidth"
(keydown.escape)="close()"
[formControlName]="fileAttribute.id"
[id]="fileAttribute.id"
[ngClass]="{ 'workflow-input': mode === 'workflow' || fileNameColumn, 'file-name-input': fileNameColumn }"

12
apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
View File

@ -6,8 +6,15 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { NavigationEnd, Router } from '@angular/router';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { DynamicInputComponent } from '@common-ui/inputs/dynamic-input/dynamic-input.component';
import { BaseFormComponent, CircleButtonComponent, HelpModeService, ListingService, Toaster } from '@iqser/common-ui';
import { Debounce } from '@iqser/common-ui/lib/utils';
import {
BaseFormComponent,
CircleButtonComponent,
HelpModeService,
ListingService,
StopPropagationDirective,
Toaster,
} from '@iqser/common-ui';
import { Debounce, log } from '@iqser/common-ui/lib/utils';
import { TranslateModule } from '@ngx-translate/core';
import { Dossier, File, FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain';
import { FileAttributesService } from '@services/entity-services/file-attributes.service';
@ -37,6 +44,7 @@ import { ConfigService } from '../../config.service';
CircleButtonComponent,
NgTemplateOutlet,
TranslateModule,
StopPropagationDirective,
],
})
export class FileAttributeComponent extends BaseFormComponent implements OnDestroy {