hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

108045: Fix for repeatable date field labels

Browse Source
This commit is contained in:
lotte
2023-11-09 15:46:57 +01:00
committed by Tim Donohue
parent 6975fd15d5
commit 30ce8440e1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
View File

@@ -1,6 +1,6 @@
<div> <div>
<fieldset class="d-flex"> <fieldset class="d-flex">
<legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"> <legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
{{model.placeholder}} <span *ngIf="model.required">*</span> {{model.placeholder}} <span *ngIf="model.required">*</span>
</legend> </legend>
<ds-number-picker <ds-number-picker

3
src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
View File

@@ -15,6 +15,7 @@ export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig { export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
legend?: string; legend?: string;
typeBindRelations?: DynamicFormControlRelation[]; typeBindRelations?: DynamicFormControlRelation[];
repeatable: boolean;
} }
/** /**
@@ -37,7 +38,7 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
this.metadataValue = (config as any).metadataValue; this.metadataValue = (config as any).metadataValue;
this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : []; this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden); this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
this.repeatable = config.repeatable;
// This was a subscription, then an async setTimeout, but it seems unnecessary // This was a subscription, then an async setTimeout, but it seems unnecessary
const parentModel = this.getRootParent(this); const parentModel = this.getRootParent(this);
if (parentModel && isNotUndefined(parentModel.hidden)) { if (parentModel && isNotUndefined(parentModel.hidden)) {